From 2860e1a336d88c07f1773254d5fe78625d7ab146 Mon Sep 17 00:00:00 2001
From: kn5886348135 <56352848+kn5886348135@users.noreply.github.com>
Date: Sun, 27 Nov 2022 17:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/tankbattle/FireStrategy.java    | 5 -----
 .../com/example/tankbattle/{strategy => demo}/Cat.java    | 2 +-
 .../tankbattle/{strategy => demo}/CustomComparable.java   | 2 +-
 .../tankbattle/{strategy => demo}/CustomComparator.java   | 2 +-
 .../com/example/tankbattle/{strategy => demo}/Dog.java    | 2 +-
 .../tankbattle/{strategy => demo}/DogComparator.java      | 2 +-
 .../com/example/tankbattle/{strategy => demo}/Main.java   | 2 +-
 .../com/example/tankbattle/{strategy => demo}/Sorter.java | 2 +-
 .../tankbattle/{ => strategy}/DefaultFireStrategy.java    | 7 ++++++-
 .../com/example/tankbattle/strategy/FireStrategy.java     | 7 +++++++
 .../tankbattle/{ => strategy}/FourDirFireStrategy.java    | 8 +++++++-
 11 files changed, 27 insertions(+), 14 deletions(-)
 delete mode 100644 src/main/java/com/example/tankbattle/FireStrategy.java
 rename src/main/java/com/example/tankbattle/{strategy => demo}/Cat.java (96%)
 rename src/main/java/com/example/tankbattle/{strategy => demo}/CustomComparable.java (61%)
 rename src/main/java/com/example/tankbattle/{strategy => demo}/CustomComparator.java (63%)
 rename src/main/java/com/example/tankbattle/{strategy => demo}/Dog.java (93%)
 rename src/main/java/com/example/tankbattle/{strategy => demo}/DogComparator.java (88%)
 rename src/main/java/com/example/tankbattle/{strategy => demo}/Main.java (95%)
 rename src/main/java/com/example/tankbattle/{strategy => demo}/Sorter.java (92%)
 rename src/main/java/com/example/tankbattle/{ => strategy}/DefaultFireStrategy.java (66%)
 create mode 100644 src/main/java/com/example/tankbattle/strategy/FireStrategy.java
 rename src/main/java/com/example/tankbattle/{ => strategy}/FourDirFireStrategy.java (67%)

diff --git a/src/main/java/com/example/tankbattle/FireStrategy.java b/src/main/java/com/example/tankbattle/FireStrategy.java
deleted file mode 100644
index ed4b7b6..0000000
--- a/src/main/java/com/example/tankbattle/FireStrategy.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example.tankbattle;
-
-public interface FireStrategy {
-    void fire(Tank tank);
-}
diff --git a/src/main/java/com/example/tankbattle/strategy/Cat.java b/src/main/java/com/example/tankbattle/demo/Cat.java
similarity index 96%
rename from src/main/java/com/example/tankbattle/strategy/Cat.java
rename to src/main/java/com/example/tankbattle/demo/Cat.java
index ce98cb4..95fd3f1 100644
--- a/src/main/java/com/example/tankbattle/strategy/Cat.java
+++ b/src/main/java/com/example/tankbattle/demo/Cat.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 
 public class Cat implements CustomComparable<Cat> {
diff --git a/src/main/java/com/example/tankbattle/strategy/CustomComparable.java b/src/main/java/com/example/tankbattle/demo/CustomComparable.java
similarity index 61%
rename from src/main/java/com/example/tankbattle/strategy/CustomComparable.java
rename to src/main/java/com/example/tankbattle/demo/CustomComparable.java
index a2b7f85..e1edf53 100644
--- a/src/main/java/com/example/tankbattle/strategy/CustomComparable.java
+++ b/src/main/java/com/example/tankbattle/demo/CustomComparable.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public interface CustomComparable<T> {
     int compareTo(T o);
diff --git a/src/main/java/com/example/tankbattle/strategy/CustomComparator.java b/src/main/java/com/example/tankbattle/demo/CustomComparator.java
similarity index 63%
rename from src/main/java/com/example/tankbattle/strategy/CustomComparator.java
rename to src/main/java/com/example/tankbattle/demo/CustomComparator.java
index 14b91f9..a8c779f 100644
--- a/src/main/java/com/example/tankbattle/strategy/CustomComparator.java
+++ b/src/main/java/com/example/tankbattle/demo/CustomComparator.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public interface CustomComparator<T> {
     int compare(T o1, T o2);
diff --git a/src/main/java/com/example/tankbattle/strategy/Dog.java b/src/main/java/com/example/tankbattle/demo/Dog.java
similarity index 93%
rename from src/main/java/com/example/tankbattle/strategy/Dog.java
rename to src/main/java/com/example/tankbattle/demo/Dog.java
index ec61531..3f726c6 100644
--- a/src/main/java/com/example/tankbattle/strategy/Dog.java
+++ b/src/main/java/com/example/tankbattle/demo/Dog.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public class Dog implements CustomComparable<Dog> {
 
diff --git a/src/main/java/com/example/tankbattle/strategy/DogComparator.java b/src/main/java/com/example/tankbattle/demo/DogComparator.java
similarity index 88%
rename from src/main/java/com/example/tankbattle/strategy/DogComparator.java
rename to src/main/java/com/example/tankbattle/demo/DogComparator.java
index 104a95b..baad4ed 100644
--- a/src/main/java/com/example/tankbattle/strategy/DogComparator.java
+++ b/src/main/java/com/example/tankbattle/demo/DogComparator.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public class DogComparator implements CustomComparator<Dog> {
 
diff --git a/src/main/java/com/example/tankbattle/strategy/Main.java b/src/main/java/com/example/tankbattle/demo/Main.java
similarity index 95%
rename from src/main/java/com/example/tankbattle/strategy/Main.java
rename to src/main/java/com/example/tankbattle/demo/Main.java
index 40eb4ae..0d7fe21 100644
--- a/src/main/java/com/example/tankbattle/strategy/Main.java
+++ b/src/main/java/com/example/tankbattle/demo/Main.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/com/example/tankbattle/strategy/Sorter.java b/src/main/java/com/example/tankbattle/demo/Sorter.java
similarity index 92%
rename from src/main/java/com/example/tankbattle/strategy/Sorter.java
rename to src/main/java/com/example/tankbattle/demo/Sorter.java
index 84eb39e..dd048f9 100644
--- a/src/main/java/com/example/tankbattle/strategy/Sorter.java
+++ b/src/main/java/com/example/tankbattle/demo/Sorter.java
@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public class Sorter<T> {
 
diff --git a/src/main/java/com/example/tankbattle/DefaultFireStrategy.java b/src/main/java/com/example/tankbattle/strategy/DefaultFireStrategy.java
similarity index 66%
rename from src/main/java/com/example/tankbattle/DefaultFireStrategy.java
rename to src/main/java/com/example/tankbattle/strategy/DefaultFireStrategy.java
index 9525c23..ebb8e7c 100644
--- a/src/main/java/com/example/tankbattle/DefaultFireStrategy.java
+++ b/src/main/java/com/example/tankbattle/strategy/DefaultFireStrategy.java
@@ -1,4 +1,9 @@
-package com.example.tankbattle;
+package com.example.tankbattle.strategy;
+
+import com.example.tankbattle.Audio;
+import com.example.tankbattle.Bullet;
+import com.example.tankbattle.Group;
+import com.example.tankbattle.Tank;
 
 public class DefaultFireStrategy implements FireStrategy{
 
diff --git a/src/main/java/com/example/tankbattle/strategy/FireStrategy.java b/src/main/java/com/example/tankbattle/strategy/FireStrategy.java
new file mode 100644
index 0000000..9cb8c86
--- /dev/null
+++ b/src/main/java/com/example/tankbattle/strategy/FireStrategy.java
@@ -0,0 +1,7 @@
+package com.example.tankbattle.strategy;
+
+import com.example.tankbattle.Tank;
+
+public interface FireStrategy {
+    void fire(Tank tank);
+}
diff --git a/src/main/java/com/example/tankbattle/FourDirFireStrategy.java b/src/main/java/com/example/tankbattle/strategy/FourDirFireStrategy.java
similarity index 67%
rename from src/main/java/com/example/tankbattle/FourDirFireStrategy.java
rename to src/main/java/com/example/tankbattle/strategy/FourDirFireStrategy.java
index c7d8d5b..fc9f399 100644
--- a/src/main/java/com/example/tankbattle/FourDirFireStrategy.java
+++ b/src/main/java/com/example/tankbattle/strategy/FourDirFireStrategy.java
@@ -1,4 +1,10 @@
-package com.example.tankbattle;
+package com.example.tankbattle.strategy;
+
+import com.example.tankbattle.Audio;
+import com.example.tankbattle.Bullet;
+import com.example.tankbattle.Dir;
+import com.example.tankbattle.Group;
+import com.example.tankbattle.Tank;
 
 public class FourDirFireStrategy implements FireStrategy{