diff --git a/src/com/demo/tank/course9/Bullet.java b/src/com/demo/tank/course9_10/Bullet.java similarity index 98% rename from src/com/demo/tank/course9/Bullet.java rename to src/com/demo/tank/course9_10/Bullet.java index 897f441..c9b6a78 100644 --- a/src/com/demo/tank/course9/Bullet.java +++ b/src/com/demo/tank/course9_10/Bullet.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import com.demo.tank.enums.Direction; import com.demo.tank.enums.Group; diff --git a/src/com/demo/tank/course9/BulletTankCollider.java b/src/com/demo/tank/course9_10/BulletTankCollider.java similarity index 96% rename from src/com/demo/tank/course9/BulletTankCollider.java rename to src/com/demo/tank/course9_10/BulletTankCollider.java index 830199b..01934ee 100644 --- a/src/com/demo/tank/course9/BulletTankCollider.java +++ b/src/com/demo/tank/course9_10/BulletTankCollider.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public class BulletTankCollider implements Collider { @Override diff --git a/src/com/demo/tank/course9/BulletWallCollider.java b/src/com/demo/tank/course9_10/BulletWallCollider.java similarity index 93% rename from src/com/demo/tank/course9/BulletWallCollider.java rename to src/com/demo/tank/course9_10/BulletWallCollider.java index 7af4ca5..0976d17 100644 --- a/src/com/demo/tank/course9/BulletWallCollider.java +++ b/src/com/demo/tank/course9_10/BulletWallCollider.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public class BulletWallCollider implements Collider { @Override diff --git a/src/com/demo/tank/course9/Collider.java b/src/com/demo/tank/course9_10/Collider.java similarity index 69% rename from src/com/demo/tank/course9/Collider.java rename to src/com/demo/tank/course9_10/Collider.java index 7ab6d92..16aaeb3 100644 --- a/src/com/demo/tank/course9/Collider.java +++ b/src/com/demo/tank/course9_10/Collider.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public interface Collider { void collide(GameObject g1, GameObject g2); diff --git a/src/com/demo/tank/course9/ColliderChain.java b/src/com/demo/tank/course9_10/ColliderChain.java similarity index 94% rename from src/com/demo/tank/course9/ColliderChain.java rename to src/com/demo/tank/course9_10/ColliderChain.java index 99d2af2..f5bbca4 100644 --- a/src/com/demo/tank/course9/ColliderChain.java +++ b/src/com/demo/tank/course9_10/ColliderChain.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.util.LinkedList; import java.util.List; diff --git a/src/com/demo/tank/course9/DefaultFireStrategy.java b/src/com/demo/tank/course9_10/DefaultFireStrategy.java similarity index 95% rename from src/com/demo/tank/course9/DefaultFireStrategy.java rename to src/com/demo/tank/course9_10/DefaultFireStrategy.java index 49169f2..decfd44 100644 --- a/src/com/demo/tank/course9/DefaultFireStrategy.java +++ b/src/com/demo/tank/course9_10/DefaultFireStrategy.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import com.demo.tank.enums.Group; import com.demo.tank.util.Audio; diff --git a/src/com/demo/tank/course9/FireStrategy.java b/src/com/demo/tank/course9_10/FireStrategy.java similarity index 64% rename from src/com/demo/tank/course9/FireStrategy.java rename to src/com/demo/tank/course9_10/FireStrategy.java index e2c0e41..2ff9880 100644 --- a/src/com/demo/tank/course9/FireStrategy.java +++ b/src/com/demo/tank/course9_10/FireStrategy.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public interface FireStrategy { void fire(Tank tank); diff --git a/src/com/demo/tank/course9/FourDirectionFireStrategy.java b/src/com/demo/tank/course9_10/FourDirectionFireStrategy.java similarity index 94% rename from src/com/demo/tank/course9/FourDirectionFireStrategy.java rename to src/com/demo/tank/course9_10/FourDirectionFireStrategy.java index 567665c..874f7b4 100644 --- a/src/com/demo/tank/course9/FourDirectionFireStrategy.java +++ b/src/com/demo/tank/course9_10/FourDirectionFireStrategy.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import com.demo.tank.enums.Direction; import com.demo.tank.enums.Group; diff --git a/src/com/demo/tank/course9/GODecorator.java b/src/com/demo/tank/course9_10/GODecorator.java similarity index 86% rename from src/com/demo/tank/course9/GODecorator.java rename to src/com/demo/tank/course9_10/GODecorator.java index 86dbd86..c92e944 100644 --- a/src/com/demo/tank/course9/GODecorator.java +++ b/src/com/demo/tank/course9_10/GODecorator.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.awt.*; diff --git a/src/com/demo/tank/course9/GameModel.java b/src/com/demo/tank/course9_10/GameModel.java similarity index 98% rename from src/com/demo/tank/course9/GameModel.java rename to src/com/demo/tank/course9_10/GameModel.java index 9afa2ea..5d3694a 100644 --- a/src/com/demo/tank/course9/GameModel.java +++ b/src/com/demo/tank/course9_10/GameModel.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import com.demo.tank.enums.Direction; import com.demo.tank.enums.Group; diff --git a/src/com/demo/tank/course9/GameObject.java b/src/com/demo/tank/course9_10/GameObject.java similarity index 84% rename from src/com/demo/tank/course9/GameObject.java rename to src/com/demo/tank/course9_10/GameObject.java index aad2061..ce0e462 100644 --- a/src/com/demo/tank/course9/GameObject.java +++ b/src/com/demo/tank/course9_10/GameObject.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.awt.*; diff --git a/src/com/demo/tank/course9/MainV9.java b/src/com/demo/tank/course9_10/MainV9.java similarity index 91% rename from src/com/demo/tank/course9/MainV9.java rename to src/com/demo/tank/course9_10/MainV9.java index dc8fc4a..ce5890e 100644 --- a/src/com/demo/tank/course9/MainV9.java +++ b/src/com/demo/tank/course9_10/MainV9.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.io.IOException; diff --git a/src/com/demo/tank/course9/RectDecorator.java b/src/com/demo/tank/course9_10/RectDecorator.java similarity index 94% rename from src/com/demo/tank/course9/RectDecorator.java rename to src/com/demo/tank/course9_10/RectDecorator.java index feddb5e..fad10fe 100644 --- a/src/com/demo/tank/course9/RectDecorator.java +++ b/src/com/demo/tank/course9_10/RectDecorator.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.awt.*; diff --git a/src/com/demo/tank/course9/TailDecorator.java b/src/com/demo/tank/course9_10/TailDecorator.java similarity index 94% rename from src/com/demo/tank/course9/TailDecorator.java rename to src/com/demo/tank/course9_10/TailDecorator.java index d71eac3..f6172f7 100644 --- a/src/com/demo/tank/course9/TailDecorator.java +++ b/src/com/demo/tank/course9_10/TailDecorator.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.awt.*; diff --git a/src/com/demo/tank/course9/Tank.java b/src/com/demo/tank/course9_10/Tank.java similarity index 98% rename from src/com/demo/tank/course9/Tank.java rename to src/com/demo/tank/course9_10/Tank.java index 412886d..6e11ef7 100644 --- a/src/com/demo/tank/course9/Tank.java +++ b/src/com/demo/tank/course9_10/Tank.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import com.demo.tank.enums.Direction; import com.demo.tank.enums.Group; @@ -38,7 +38,7 @@ public class Tank extends GameObject { if (this.group == Group.GOOD) { // String className = PropertyManager.getString("good.tank.fire.strategy"); try { - fireStrategy = (FireStrategy) Class.forName("com.demo.tank.course9.FourDirectionFireStrategy").newInstance(); + fireStrategy = (FireStrategy) Class.forName("com.demo.tank.course9_10.FourDirectionFireStrategy").newInstance(); } catch (ClassNotFoundException e) { e.printStackTrace(); } catch (InstantiationException e) { diff --git a/src/com/demo/tank/course9/TankEvent.java b/src/com/demo/tank/course9_10/TankEvent.java similarity index 91% rename from src/com/demo/tank/course9/TankEvent.java rename to src/com/demo/tank/course9_10/TankEvent.java index da23fc9..828dd57 100644 --- a/src/com/demo/tank/course9/TankEvent.java +++ b/src/com/demo/tank/course9_10/TankEvent.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.sql.Timestamp; diff --git a/src/com/demo/tank/course9/TankFireHandler.java b/src/com/demo/tank/course9_10/TankFireHandler.java similarity index 88% rename from src/com/demo/tank/course9/TankFireHandler.java rename to src/com/demo/tank/course9_10/TankFireHandler.java index 331d69d..fe8751c 100644 --- a/src/com/demo/tank/course9/TankFireHandler.java +++ b/src/com/demo/tank/course9_10/TankFireHandler.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public class TankFireHandler implements TankFireObserver{ @Override diff --git a/src/com/demo/tank/course9/TankFireObserver.java b/src/com/demo/tank/course9_10/TankFireObserver.java similarity index 69% rename from src/com/demo/tank/course9/TankFireObserver.java rename to src/com/demo/tank/course9_10/TankFireObserver.java index c5a164a..3ed6a2f 100644 --- a/src/com/demo/tank/course9/TankFireObserver.java +++ b/src/com/demo/tank/course9_10/TankFireObserver.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public interface TankFireObserver { void actionOnFire(TankEvent event); diff --git a/src/com/demo/tank/course9/TankFrameV9.java b/src/com/demo/tank/course9_10/TankFrameV9.java similarity index 98% rename from src/com/demo/tank/course9/TankFrameV9.java rename to src/com/demo/tank/course9_10/TankFrameV9.java index 1ff669e..79beb29 100644 --- a/src/com/demo/tank/course9/TankFrameV9.java +++ b/src/com/demo/tank/course9_10/TankFrameV9.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import com.demo.tank.enums.Direction; diff --git a/src/com/demo/tank/course9/TankTankCollider.java b/src/com/demo/tank/course9_10/TankTankCollider.java similarity index 93% rename from src/com/demo/tank/course9/TankTankCollider.java rename to src/com/demo/tank/course9_10/TankTankCollider.java index b2101b0..2b0a8d4 100644 --- a/src/com/demo/tank/course9/TankTankCollider.java +++ b/src/com/demo/tank/course9_10/TankTankCollider.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.util.Random; diff --git a/src/com/demo/tank/course9/TankWallCollider.java b/src/com/demo/tank/course9_10/TankWallCollider.java similarity index 93% rename from src/com/demo/tank/course9/TankWallCollider.java rename to src/com/demo/tank/course9_10/TankWallCollider.java index f685938..e299779 100644 --- a/src/com/demo/tank/course9/TankWallCollider.java +++ b/src/com/demo/tank/course9_10/TankWallCollider.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; public class TankWallCollider implements Collider { @Override diff --git a/src/com/demo/tank/course9/Wall.java b/src/com/demo/tank/course9_10/Wall.java similarity index 94% rename from src/com/demo/tank/course9/Wall.java rename to src/com/demo/tank/course9_10/Wall.java index f94fb0d..19245a7 100644 --- a/src/com/demo/tank/course9/Wall.java +++ b/src/com/demo/tank/course9_10/Wall.java @@ -1,4 +1,4 @@ -package com.demo.tank.course9; +package com.demo.tank.course9_10; import java.awt.*;