From fbba4b1d57c3162af51f924ffa2578098b25620f Mon Sep 17 00:00:00 2001 From: Diana Date: Sat, 15 Apr 2023 11:40:32 +0300 Subject: [PATCH 1/7] Dumitriu Diana - Am creat o clasa --- _1_basics/src/main/java/code/_3_in_class/Salut.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 _1_basics/src/main/java/code/_3_in_class/Salut.java diff --git a/_1_basics/src/main/java/code/_3_in_class/Salut.java b/_1_basics/src/main/java/code/_3_in_class/Salut.java new file mode 100644 index 000000000..f8da85b32 --- /dev/null +++ b/_1_basics/src/main/java/code/_3_in_class/Salut.java @@ -0,0 +1,7 @@ +package code._3_in_class; + +public class Salut { + public static void main(String[] args) { + System.out.println("Saluuut"); + } +} From 35e3fab075dfd3fb1f62f62501298992d4a54746 Mon Sep 17 00:00:00 2001 From: Diana Date: Sat, 22 Apr 2023 13:05:20 +0300 Subject: [PATCH 2/7] OOP --- .../src/main/java/code/_3_in_class/Boxer.java | 34 +++++++++++++++++++ .../java/code/_3_in_class/Interface01.java | 12 +++++++ .../java/code/_3_in_class/Interface02.java | 12 +++++++ .../src/main/java/code/_3_in_class/Main.java | 30 +++++++++++++++- .../java/code/_3_in_class/RandomClass.java | 12 +++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 _2_oo/src/main/java/code/_3_in_class/Boxer.java create mode 100644 _2_oo/src/main/java/code/_3_in_class/Interface01.java create mode 100644 _2_oo/src/main/java/code/_3_in_class/Interface02.java create mode 100644 _2_oo/src/main/java/code/_3_in_class/RandomClass.java diff --git a/_2_oo/src/main/java/code/_3_in_class/Boxer.java b/_2_oo/src/main/java/code/_3_in_class/Boxer.java new file mode 100644 index 000000000..164d219db --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/Boxer.java @@ -0,0 +1,34 @@ +package code._3_in_class; +import java.util.Random; +public class Boxer { + /* + State: name, health, damagePerAttack; + Behaviour: attack, defend; + */ + + String nume; + int health = 100; + int damagePerAttack =10; + public Boxer( String nume, int health, int damagePerAttack) + { + this.nume = nume; + this.health = health; + this.damagePerAttack = damagePerAttack; + } + public Boxer (String nume) + { + this.nume = nume; + } + void attack(Boxer opponent){ + int defendValue = (this.damagePerAttack * this.defend())/100; + opponent.health= opponent.health - (this.damagePerAttack-defendValue); + System.out.println("defendValue: "+ defendValue); + System.out.println("newHealth: " + opponent.health); + } + int defend() { + Random random = new Random(); + int defendPercentage= random.nextInt(101); + return defendPercentage; + } + +} diff --git a/_2_oo/src/main/java/code/_3_in_class/Interface01.java b/_2_oo/src/main/java/code/_3_in_class/Interface01.java new file mode 100644 index 000000000..e2f872c5c --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/Interface01.java @@ -0,0 +1,12 @@ +package code._3_in_class; + +public interface Interface01 { + default void m() + { + System.out.println("hello world from m()"); + } + default void m01() + { + System.out.println("hello world from m01()"); + } +} diff --git a/_2_oo/src/main/java/code/_3_in_class/Interface02.java b/_2_oo/src/main/java/code/_3_in_class/Interface02.java new file mode 100644 index 000000000..93ac36f49 --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/Interface02.java @@ -0,0 +1,12 @@ +package code._3_in_class; + +public interface Interface02 { + default void m() + { + System.out.println("hello world from m()"); + } + default void m02() + { + System.out.println("hello world from m02()"); + } +} diff --git a/_2_oo/src/main/java/code/_3_in_class/Main.java b/_2_oo/src/main/java/code/_3_in_class/Main.java index 3b87b4563..9ce4a68c7 100644 --- a/_2_oo/src/main/java/code/_3_in_class/Main.java +++ b/_2_oo/src/main/java/code/_3_in_class/Main.java @@ -1,8 +1,36 @@ package code._3_in_class; - +import java.util.Random; public class Main { public static void main(String[] args) { //TODO put your code changes in here + Boxer ion = new Boxer("ion",100,10 ); + Boxer vasile = new Boxer("vasile"); + + //start meci + startBoxingMatch(ion, vasile); + announceVictory(ion); + + } + + private static void announceVictory(Boxer ion) { + if(ion.health<=0) { + System.out.println(" Ion a castigat meciul de box."); + }else { + System.out.println(" Vasile a castigat meciul de box."); + } + } + + private static void startBoxingMatch(Boxer ion, Boxer vasile) { + Random random = new Random(); + + while(ion.health >0 && vasile.health>0 ) + { int zeroOrOne = random.nextInt( 2); + if(zeroOrOne == 0) + ion.attack(vasile); + else + vasile.attack(ion); + + } } } \ No newline at end of file diff --git a/_2_oo/src/main/java/code/_3_in_class/RandomClass.java b/_2_oo/src/main/java/code/_3_in_class/RandomClass.java new file mode 100644 index 000000000..c1161cc3c --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/RandomClass.java @@ -0,0 +1,12 @@ +package code._3_in_class; + +public class RandomClass implements Interface01, Interface02 +{ + public static void main(String[] args){ + RandomClass c= new RandomClass(); + c.m(); + } + public void m(){ + Interface02.super.m(); + } +} From b9e982c7ece716102e9083cae2d4d4983d4a5848 Mon Sep 17 00:00:00 2001 From: Diana Date: Sat, 22 Apr 2023 13:24:32 +0300 Subject: [PATCH 3/7] OOP2 --- .../main/java/code/_3_in_class/car/Main.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 _2_oo/src/main/java/code/_3_in_class/car/Main.java diff --git a/_2_oo/src/main/java/code/_3_in_class/car/Main.java b/_2_oo/src/main/java/code/_3_in_class/car/Main.java new file mode 100644 index 000000000..119b6526f --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/car/Main.java @@ -0,0 +1,52 @@ +package code._3_in_class.car; + +public class Main { + static class Human + { + Car car; + public Human(Car car) + { + this.car= car; + } + void increaseSpeed(){ + car.increaseSpeed(); + } + + } + static interface Car{ + void increaseSpeed(); + } + static class GasCar implements Car{ + Engine engine= new GasEngine(); + public void increaseSpeed(){ + engine.increaseSpeed(); + } + } + static class ElectricalCar implements Car{ + Engine engine= new ElectricalEngine(); + public void increaseSpeed(){ + engine.increaseSpeed(); + } + } + static interface Engine{ + void increaseSpeed(); + } + static class ElectricalEngine implements Engine{ + public void increaseSpeed() + { + System.out.println("increase speed implementation from ElectricalEngine"); + } + } + static class GasEngine implements Engine{ + public void increaseSpeed() + { + System.out.println("increase speed implementation from GasEngine"); + } + } + public static void main(String[] args){ + Human human01 = new Human(new ElectricalCar()); + Human human02 = new Human(new GasCar()); + human01.increaseSpeed(); + human02.increaseSpeed(); + } +} From 23e38c626c721cd03fe9f99a59213d92937de96b Mon Sep 17 00:00:00 2001 From: Diana Date: Sat, 22 Apr 2023 14:08:04 +0300 Subject: [PATCH 4/7] FizzBuzz Challenge --- .../_3_in_class/CorelatieNumarString.java | 11 +++++ .../code/_3_in_class/FizzBuzzChallenge.java | 48 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 _2_oo/src/main/java/code/_3_in_class/CorelatieNumarString.java create mode 100644 _2_oo/src/main/java/code/_3_in_class/FizzBuzzChallenge.java diff --git a/_2_oo/src/main/java/code/_3_in_class/CorelatieNumarString.java b/_2_oo/src/main/java/code/_3_in_class/CorelatieNumarString.java new file mode 100644 index 000000000..e2f551d9e --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/CorelatieNumarString.java @@ -0,0 +1,11 @@ +package code._3_in_class; + +public class CorelatieNumarString { + int nr; + String word; + CorelatieNumarString(int nr, String word) + { this.nr= nr; + this.word=word; + + } +} diff --git a/_2_oo/src/main/java/code/_3_in_class/FizzBuzzChallenge.java b/_2_oo/src/main/java/code/_3_in_class/FizzBuzzChallenge.java new file mode 100644 index 000000000..51aa72de7 --- /dev/null +++ b/_2_oo/src/main/java/code/_3_in_class/FizzBuzzChallenge.java @@ -0,0 +1,48 @@ +package code._3_in_class; + +public class FizzBuzzChallenge { + public static void main(String[] args) + { + // fizzBuzzCuIf(); + fizzBuzzCuObiecte(); + } + + private static void fizzBuzzCuObiecte() { + + CorelatieNumarString[] corelatii ={ + new CorelatieNumarString(3,"Fizz"), + new CorelatieNumarString(5,"Buzz"), + new CorelatieNumarString(7,"Rizz"), + new CorelatieNumarString(11, "Jazz") + }; + for(int i=1;i<=100;i++) { + boolean nrEsteDivizibil = false; + String textNrDiv= ""; + for (CorelatieNumarString corelatie : corelatii) { + if (i % corelatie.nr == 0) { + nrEsteDivizibil = true; + textNrDiv += corelatie.word; + } + + } + if(nrEsteDivizibil==true ) + System.out.println(textNrDiv); + else System.out.println(i); + } + } + + private static void fizzBuzzCuIf() { + for(int i=1;i<=100;i++) + { + if(i%5 == 0 && i%3 == 0) + System.out.println("FizzBuzz"); + else if(i%3 == 0) + System.out.println("Fizz"); + else if (i % 5 == 0) + System.out.println("Buzz"); + else + System.out.println(i); + + } + } +} From a78efc39b386f39aa26b1985936ca668442da730 Mon Sep 17 00:00:00 2001 From: Diana Date: Sun, 14 May 2023 01:19:55 +0300 Subject: [PATCH 5/7] PROIECTE --- .../code/_4_student_effort/DessertOrder.java | 7 ++++ .../code/_4_student_effort/DrinkOrder.java | 7 ++++ .../code/_4_student_effort/FoodOrder.java | 7 ++++ .../code/_4_student_effort/KitchenStaff.java | 17 +++++++++ .../java/code/_4_student_effort/Main.java | 35 +++++++++++++++++-- .../java/code/_4_student_effort/Maze.java | 20 +++++++++++ .../code/_4_student_effort/Observable.java | 9 +++++ .../java/code/_4_student_effort/Obstacle.java | 5 +++ .../_4_student_effort/ObstacleFactory.java | 15 ++++++++ .../java/code/_4_student_effort/Order.java | 5 +++ .../code/_4_student_effort/OrderFactory.java | 18 ++++++++++ .../code/_4_student_effort/OrderNotifier.java | 20 +++++++++++ .../main/java/code/_4_student_effort/Pit.java | 8 +++++ .../java/code/_4_student_effort/Wall.java | 8 +++++ 14 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Maze.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Observable.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Order.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Pit.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Wall.java diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java new file mode 100644 index 000000000..9d06149b3 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java @@ -0,0 +1,7 @@ +package code._4_student_effort; + +public class DessertOrder implements Order{ + public void prepare() { + System.out.println("Preparing dessert order"); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java new file mode 100644 index 000000000..10189f7d0 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java @@ -0,0 +1,7 @@ +package code._4_student_effort; + +public class DrinkOrder implements Order{ + public void prepare() { + System.out.println("Preparing drink order"); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java new file mode 100644 index 000000000..6b5efc0fa --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java @@ -0,0 +1,7 @@ +package code._4_student_effort; + +public class FoodOrder implements Order{ + public void prepare() { + System.out.println("Preparing food order"); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java b/_3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java new file mode 100644 index 000000000..be2842b2a --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java @@ -0,0 +1,17 @@ +package code._4_student_effort; + +import code._2_challenge._4_observer.Observer; + +public class KitchenStaff implements Observable{ + public void update(Observer obs, Object obj) { + System.out.println("Kitchen staff notified of new order"); + Order order = (Order) obj; + order.prepare(); + + } + + @Override + public void observe() { + + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java index 95bb1182c..615aa8e8b 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java @@ -1,8 +1,39 @@ package code._4_student_effort; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class Main { - public static void main(String[] args) { - //TODO put your code changes in here + /* public static void main(String[] args) { + // Get the maze instance + Maze maze = Maze.getInstance(); + // Navigate through the maze + maze.navigate(); + // Create the obstacle factory + ObstacleFactory obstacleFactory = new ObstacleFactory(); + // Create and avoid the first obstacle + Obstacle pit = obstacleFactory.createObstacle("PIT"); + pit.avoid(); + // Create and avoid the second obstacle + Obstacle wall = obstacleFactory.createObstacle("WALL"); + wall.avoid(); } } +*/ + public static void main(String[] args) { + OrderFactory factory = new OrderFactory(); + OrderNotifier notifier = new OrderNotifier(); + KitchenStaff staff = new KitchenStaff(); + // notifier.addObserver(staff); + + Order foodOrder = factory.createOrder("food"); + Order drinkOrder = factory.createOrder("drink"); + Order dessertOrder = factory.createOrder("dessert"); + + notifier.addOrder(foodOrder); + notifier.addOrder(drinkOrder); + notifier.addOrder(dessertOrder); + } + +} \ No newline at end of file diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Maze.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze.java new file mode 100644 index 000000000..70b8bcf60 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze.java @@ -0,0 +1,20 @@ +package code._4_student_effort; + +public class Maze { + // Private static instance of the maze + private static Maze instance = null; + // Private constructor to prevent creating new instances + private Maze() { + } + // Static method to get the instance of the maze + public static Maze getInstance() { + if (instance == null) { + instance = new Maze(); + } + return instance; + } + // Method to navigate through the maze + public void navigate() { + System.out.println("Navigating through the maze..."); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Observable.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Observable.java new file mode 100644 index 000000000..24bf823d5 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Observable.java @@ -0,0 +1,9 @@ +package code._4_student_effort; + +import code._2_challenge._4_observer.Observer; + +public interface Observable { + + void observe(); + +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java new file mode 100644 index 000000000..5079ce9a3 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java @@ -0,0 +1,5 @@ +package code._4_student_effort; + +public interface Obstacle { + public void avoid(); +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java b/_3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java new file mode 100644 index 000000000..902b5df72 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java @@ -0,0 +1,15 @@ +package code._4_student_effort; + +public class ObstacleFactory { + public Obstacle createObstacle(String obstacleType) { + if (obstacleType == null) { + return null; + } + if (obstacleType.equalsIgnoreCase("PIT")) { + return new Pit(); + } else if (obstacleType.equalsIgnoreCase("WALL")) { + return new Wall(); + } + return null; + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java new file mode 100644 index 000000000..70467e2c9 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java @@ -0,0 +1,5 @@ +package code._4_student_effort; + +public interface Order { + void prepare(); +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java new file mode 100644 index 000000000..7fb0481f3 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java @@ -0,0 +1,18 @@ +package code._4_student_effort; + +public class OrderFactory { + public Order createOrder(String type) { + if(type.equalsIgnoreCase("food")) { + return new FoodOrder(); + } + else if(type.equalsIgnoreCase("drink")) { + return new DrinkOrder(); + } + else if(type.equalsIgnoreCase("dessert")) { + return new DessertOrder(); + } + else { + return null; + } + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java new file mode 100644 index 000000000..323eb3414 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java @@ -0,0 +1,20 @@ +package code._4_student_effort; + +public class OrderNotifier implements Observable { + public void addOrder(Order order) { + setChanged(); + notifyObservers(order); + } + + private void notifyObservers(Order order) { + } + + private void setChanged() { + + } + + @Override + public void observe() { + + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Pit.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Pit.java new file mode 100644 index 000000000..9d0e0e046 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Pit.java @@ -0,0 +1,8 @@ +package code._4_student_effort; + +public class Pit implements Obstacle{ + @Override + public void avoid() { + System.out.println("Jumping over the pit!"); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Wall.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Wall.java new file mode 100644 index 000000000..cbd459a14 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Wall.java @@ -0,0 +1,8 @@ +package code._4_student_effort; + +public class Wall implements Obstacle{ + @Override + public void avoid() { + System.out.println("Climbing over the wall!"); + } +} From 6d0305d5848b2b41d25c9ad9a4247538fbcd2a63 Mon Sep 17 00:00:00 2001 From: Diana Date: Fri, 19 May 2023 21:04:29 +0300 Subject: [PATCH 6/7] Proiect Java - Dumitriu Diana Adina --- .../code/_4_student_effort/DessertOrder.java | 6 +++- .../code/_4_student_effort/DrinkOrder.java | 7 ++++- .../code/_4_student_effort/FoodOrder.java | 6 +++- .../java/code/_4_student_effort/Kitchen.java | 15 ++++++++++ .../code/_4_student_effort/KitchenStaff.java | 17 ----------- .../java/code/_4_student_effort/Main.java | 30 +++++++++---------- .../code/_4_student_effort/Observable.java | 9 ------ .../java/code/_4_student_effort/Order.java | 2 +- .../code/_4_student_effort/OrderFactory.java | 16 +++++----- .../code/_4_student_effort/OrderNotifier.java | 20 ------------- .../java/code/_4_student_effort/Person.java | 23 ++++++++++++++ .../_4_student_effort/PrepareAnOrder.java | 5 ++++ .../java/code/_4_student_effort/Staff.java | 11 +++++++ 13 files changed, 93 insertions(+), 74 deletions(-) create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java delete mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java delete mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Observable.java delete mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Person.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Staff.java diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java index 9d06149b3..91c10ab85 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java @@ -1,7 +1,11 @@ package code._4_student_effort; public class DessertOrder implements Order{ - public void prepare() { + public DessertOrder() + { + + } + public void create() { System.out.println("Preparing dessert order"); } } diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java index 10189f7d0..c76b6fd5c 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java @@ -1,7 +1,12 @@ package code._4_student_effort; public class DrinkOrder implements Order{ - public void prepare() { + + public DrinkOrder() + { + + } + public void create() { System.out.println("Preparing drink order"); } } diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java index 6b5efc0fa..486c6182e 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java @@ -1,7 +1,11 @@ package code._4_student_effort; public class FoodOrder implements Order{ - public void prepare() { + public FoodOrder() + { + + } + public void create() { System.out.println("Preparing food order"); } } diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java new file mode 100644 index 000000000..39c2dedb9 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java @@ -0,0 +1,15 @@ +package code._4_student_effort; + +public class Kitchen { + + Staff staff = new Staff(); + + public Kitchen() + { + + } + public void notify(Order order) + { + this.staff.update(); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java b/_3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java deleted file mode 100644 index be2842b2a..000000000 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/KitchenStaff.java +++ /dev/null @@ -1,17 +0,0 @@ -package code._4_student_effort; - -import code._2_challenge._4_observer.Observer; - -public class KitchenStaff implements Observable{ - public void update(Observer obs, Object obj) { - System.out.println("Kitchen staff notified of new order"); - Order order = (Order) obj; - order.prepare(); - - } - - @Override - public void observe() { - - } -} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java index 615aa8e8b..b051185b8 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java @@ -1,7 +1,6 @@ package code._4_student_effort; import java.util.ArrayList; import java.util.List; -import java.util.Random; public class Main { @@ -21,19 +20,20 @@ public class Main { } } */ - public static void main(String[] args) { - OrderFactory factory = new OrderFactory(); - OrderNotifier notifier = new OrderNotifier(); - KitchenStaff staff = new KitchenStaff(); - // notifier.addObserver(staff); - Order foodOrder = factory.createOrder("food"); - Order drinkOrder = factory.createOrder("drink"); - Order dessertOrder = factory.createOrder("dessert"); - - notifier.addOrder(foodOrder); - notifier.addOrder(drinkOrder); - notifier.addOrder(dessertOrder); - } + public Main() { + } -} \ No newline at end of file + public static void main(String[] args) { + OrderFactory factory = new OrderFactory(); + Order foodOrder = factory.createOrder("food"); + Order drinkOrder = factory.createOrder("drink"); + Order dessertOrder = factory.createOrder("dessert"); + List orders = new ArrayList(); + orders.add(foodOrder); + orders.add(drinkOrder); + orders.add(dessertOrder); + Person person = new Person(orders); + person.makeAnOrder(); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Observable.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Observable.java deleted file mode 100644 index 24bf823d5..000000000 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Observable.java +++ /dev/null @@ -1,9 +0,0 @@ -package code._4_student_effort; - -import code._2_challenge._4_observer.Observer; - -public interface Observable { - - void observe(); - -} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java index 70467e2c9..d952cbf69 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java @@ -1,5 +1,5 @@ package code._4_student_effort; public interface Order { - void prepare(); + void create(); } diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java index 7fb0481f3..dd8c30cdf 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java @@ -1,18 +1,16 @@ package code._4_student_effort; public class OrderFactory { + public OrderFactory() { + } + public Order createOrder(String type) { - if(type.equalsIgnoreCase("food")) { + if (type.equalsIgnoreCase("food")) { return new FoodOrder(); - } - else if(type.equalsIgnoreCase("drink")) { + } else if (type.equalsIgnoreCase("drink")) { return new DrinkOrder(); - } - else if(type.equalsIgnoreCase("dessert")) { - return new DessertOrder(); - } - else { - return null; + } else { + return type.equalsIgnoreCase("dessert") ? new DessertOrder() : null; } } } diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java b/_3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java deleted file mode 100644 index 323eb3414..000000000 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderNotifier.java +++ /dev/null @@ -1,20 +0,0 @@ -package code._4_student_effort; - -public class OrderNotifier implements Observable { - public void addOrder(Order order) { - setChanged(); - notifyObservers(order); - } - - private void notifyObservers(Order order) { - } - - private void setChanged() { - - } - - @Override - public void observe() { - - } -} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Person.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Person.java new file mode 100644 index 000000000..188eb11ae --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Person.java @@ -0,0 +1,23 @@ +package code._4_student_effort; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +public class Person { + public String Name; + public Kitchen kitchen = new Kitchen(); + public List orderList = new ArrayList(); + + public Person(List orders) { + this.orderList = orders; + } + + public void makeAnOrder() { + Iterator var1 = this.orderList.iterator(); + + while(var1.hasNext()) { + Order order = (Order)var1.next(); + this.kitchen.notify(order); + } + + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java new file mode 100644 index 000000000..4b5923750 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java @@ -0,0 +1,5 @@ +package code._4_student_effort; + +public interface PrepareAnOrder { + void update(); +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Staff.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Staff.java new file mode 100644 index 000000000..eb16c553b --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Staff.java @@ -0,0 +1,11 @@ +package code._4_student_effort; + +public class Staff implements PrepareAnOrder { + public Staff() + { + + } + public void update() { + System.out.println("Coamanda este in preparare"); + } +} From 98159b14afbddf78944b34d0dc689f96e2896eb7 Mon Sep 17 00:00:00 2001 From: Diana Date: Sat, 20 May 2023 11:10:00 +0300 Subject: [PATCH 7/7] Dumitriu Diana Adina - Proiect final JavaCourse --- .../{ => DesignPatterns}/DessertOrder.java | 4 ++-- .../{ => DesignPatterns}/DrinkOrder.java | 4 ++-- .../{ => DesignPatterns}/FoodOrder.java | 4 ++-- .../{ => DesignPatterns}/Kitchen.java | 2 +- .../{ => DesignPatterns}/Main.java | 23 ++++--------------- .../{ => DesignPatterns}/Order.java | 2 +- .../{ => DesignPatterns}/OrderFactory.java | 7 +++++- .../{ => DesignPatterns}/Person.java | 5 +++- .../{ => DesignPatterns}/PrepareAnOrder.java | 2 +- .../{ => DesignPatterns}/Staff.java | 4 +++- .../code/_4_student_effort/Maze/Main.java | 20 ++++++++++++++++ .../_4_student_effort/{ => Maze}/Maze.java | 2 +- .../{ => Maze}/Obstacle.java | 2 +- .../{ => Maze}/ObstacleFactory.java | 2 +- .../java/code/_4_student_effort/Maze/Pit.java | 10 ++++++++ .../code/_4_student_effort/Maze/Wall.java | 10 ++++++++ .../main/java/code/_4_student_effort/Pit.java | 8 ------- .../java/code/_4_student_effort/Wall.java | 8 ------- 18 files changed, 70 insertions(+), 49 deletions(-) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/DessertOrder.java (58%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/DrinkOrder.java (58%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/FoodOrder.java (58%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/Kitchen.java (78%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/Main.java (50%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/Order.java (50%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/OrderFactory.java (59%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/Person.java (77%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/PrepareAnOrder.java (54%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => DesignPatterns}/Staff.java (61%) create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Maze/Main.java rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => Maze}/Maze.java (93%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => Maze}/Obstacle.java (60%) rename _3_design_patterns/src/main/java/code/_4_student_effort/{ => Maze}/ObstacleFactory.java (90%) create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Maze/Pit.java create mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Maze/Wall.java delete mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Pit.java delete mode 100644 _3_design_patterns/src/main/java/code/_4_student_effort/Wall.java diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/DessertOrder.java similarity index 58% rename from _3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/DessertOrder.java index 91c10ab85..4887f9ff1 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/DessertOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/DessertOrder.java @@ -1,6 +1,6 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; -public class DessertOrder implements Order{ +public class DessertOrder implements Order { public DessertOrder() { diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/DrinkOrder.java similarity index 58% rename from _3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/DrinkOrder.java index c76b6fd5c..c306d6e87 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/DrinkOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/DrinkOrder.java @@ -1,6 +1,6 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; -public class DrinkOrder implements Order{ +public class DrinkOrder implements Order { public DrinkOrder() { diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/FoodOrder.java similarity index 58% rename from _3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/FoodOrder.java index 486c6182e..910490fad 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/FoodOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/FoodOrder.java @@ -1,6 +1,6 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; -public class FoodOrder implements Order{ +public class FoodOrder implements Order { public FoodOrder() { diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Kitchen.java similarity index 78% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Kitchen.java index 39c2dedb9..1f3b785a6 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Kitchen.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Kitchen.java @@ -1,4 +1,4 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; public class Kitchen { diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Main.java similarity index 50% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Main.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Main.java index b051185b8..6c77818b5 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Main.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Main.java @@ -1,26 +1,13 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; +import code._4_student_effort.DesignPatterns.Order; +import code._4_student_effort.DesignPatterns.OrderFactory; +import code._4_student_effort.DesignPatterns.Person; + import java.util.ArrayList; import java.util.List; public class Main { - /* public static void main(String[] args) { - // Get the maze instance - Maze maze = Maze.getInstance(); - // Navigate through the maze - maze.navigate(); - // Create the obstacle factory - ObstacleFactory obstacleFactory = new ObstacleFactory(); - // Create and avoid the first obstacle - Obstacle pit = obstacleFactory.createObstacle("PIT"); - pit.avoid(); - // Create and avoid the second obstacle - Obstacle wall = obstacleFactory.createObstacle("WALL"); - wall.avoid(); - } -} -*/ - public Main() { } diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Order.java similarity index 50% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Order.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Order.java index d952cbf69..bc1816dfc 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Order.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Order.java @@ -1,4 +1,4 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; public interface Order { void create(); diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/OrderFactory.java similarity index 59% rename from _3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/OrderFactory.java index dd8c30cdf..464477628 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/OrderFactory.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/OrderFactory.java @@ -1,4 +1,9 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; + +import code._4_student_effort.DesignPatterns.DessertOrder; +import code._4_student_effort.DesignPatterns.DrinkOrder; +import code._4_student_effort.DesignPatterns.FoodOrder; +import code._4_student_effort.DesignPatterns.Order; public class OrderFactory { public OrderFactory() { diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Person.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Person.java similarity index 77% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Person.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Person.java index 188eb11ae..c3cf438da 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Person.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Person.java @@ -1,4 +1,7 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; +import code._4_student_effort.DesignPatterns.Kitchen; +import code._4_student_effort.DesignPatterns.Order; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/PrepareAnOrder.java similarity index 54% rename from _3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/PrepareAnOrder.java index 4b5923750..3cda0dee0 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/PrepareAnOrder.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/PrepareAnOrder.java @@ -1,4 +1,4 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; public interface PrepareAnOrder { void update(); diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Staff.java b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Staff.java similarity index 61% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Staff.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Staff.java index eb16c553b..d8da3a4ed 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Staff.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/DesignPatterns/Staff.java @@ -1,4 +1,6 @@ -package code._4_student_effort; +package code._4_student_effort.DesignPatterns; + +import code._4_student_effort.DesignPatterns.PrepareAnOrder; public class Staff implements PrepareAnOrder { public Staff() diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Main.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Main.java new file mode 100644 index 000000000..407d5088c --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Main.java @@ -0,0 +1,20 @@ +package code._4_student_effort.Maze; + +public class Main { + + public static void main(String[] args) { + // Get the maze instance + Maze maze = Maze.getInstance(); + // Navigate through the maze + maze.navigate(); + // Create the obstacle factory + ObstacleFactory obstacleFactory = new ObstacleFactory(); + // Create and avoid the first obstacle + Obstacle pit = obstacleFactory.createObstacle("PIT"); + pit.avoid(); + // Create and avoid the second obstacle + Obstacle wall = obstacleFactory.createObstacle("WALL"); + wall.avoid(); + } +} + diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Maze.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Maze.java similarity index 93% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Maze.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/Maze/Maze.java index 70b8bcf60..3a966939e 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Maze.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Maze.java @@ -1,4 +1,4 @@ -package code._4_student_effort; +package code._4_student_effort.Maze; public class Maze { // Private static instance of the maze diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Obstacle.java similarity index 60% rename from _3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/Maze/Obstacle.java index 5079ce9a3..d46acb8cd 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Obstacle.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Obstacle.java @@ -1,4 +1,4 @@ -package code._4_student_effort; +package code._4_student_effort.Maze; public interface Obstacle { public void avoid(); diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/ObstacleFactory.java similarity index 90% rename from _3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java rename to _3_design_patterns/src/main/java/code/_4_student_effort/Maze/ObstacleFactory.java index 902b5df72..1148f69b3 100644 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/ObstacleFactory.java +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/ObstacleFactory.java @@ -1,4 +1,4 @@ -package code._4_student_effort; +package code._4_student_effort.Maze; public class ObstacleFactory { public Obstacle createObstacle(String obstacleType) { diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Pit.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Pit.java new file mode 100644 index 000000000..5d00ac659 --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Pit.java @@ -0,0 +1,10 @@ +package code._4_student_effort.Maze; + +import code._4_student_effort.Maze.Obstacle; + +public class Pit implements Obstacle { + @Override + public void avoid() { + System.out.println("Jumping over the pit!"); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Wall.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Wall.java new file mode 100644 index 000000000..a49b6d52e --- /dev/null +++ b/_3_design_patterns/src/main/java/code/_4_student_effort/Maze/Wall.java @@ -0,0 +1,10 @@ +package code._4_student_effort.Maze; + +import code._4_student_effort.Maze.Obstacle; + +public class Wall implements Obstacle { + @Override + public void avoid() { + System.out.println("Climbing over the wall!"); + } +} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Pit.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Pit.java deleted file mode 100644 index 9d0e0e046..000000000 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Pit.java +++ /dev/null @@ -1,8 +0,0 @@ -package code._4_student_effort; - -public class Pit implements Obstacle{ - @Override - public void avoid() { - System.out.println("Jumping over the pit!"); - } -} diff --git a/_3_design_patterns/src/main/java/code/_4_student_effort/Wall.java b/_3_design_patterns/src/main/java/code/_4_student_effort/Wall.java deleted file mode 100644 index cbd459a14..000000000 --- a/_3_design_patterns/src/main/java/code/_4_student_effort/Wall.java +++ /dev/null @@ -1,8 +0,0 @@ -package code._4_student_effort; - -public class Wall implements Obstacle{ - @Override - public void avoid() { - System.out.println("Climbing over the wall!"); - } -}