From ff32fc3a2d0fd04f353beba9d149a903e8f96cd4 Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 15 Apr 2023 11:45:14 +0300 Subject: [PATCH 1/8] am adugat o clasa --- _1_basics/src/main/java/code/_3_in_class/Ex.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 _1_basics/src/main/java/code/_3_in_class/Ex.java diff --git a/_1_basics/src/main/java/code/_3_in_class/Ex.java b/_1_basics/src/main/java/code/_3_in_class/Ex.java new file mode 100644 index 000000000..6b812df42 --- /dev/null +++ b/_1_basics/src/main/java/code/_3_in_class/Ex.java @@ -0,0 +1,7 @@ +package code._3_in_class; + +public class Ex { + public static void main(String[] args) { + System.out.println("salut"); + } +} From 575e40feda15c00bd2bc123b8a64ccf09db2d89f Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Fri, 19 May 2023 23:58:32 +0300 Subject: [PATCH 2/8] boxer --- .../src/main/java/code/_3_in_class/Boxer.java | 24 ++++++++++++ .../src/main/java/code/_3_in_class/JohnCena | 13 +++++++ .../main/java/code/_3_in_class/MainBoxer.java | 37 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 _1_basics/src/main/java/code/_3_in_class/Boxer.java create mode 100644 _1_basics/src/main/java/code/_3_in_class/JohnCena create mode 100644 _1_basics/src/main/java/code/_3_in_class/MainBoxer.java diff --git a/_1_basics/src/main/java/code/_3_in_class/Boxer.java b/_1_basics/src/main/java/code/_3_in_class/Boxer.java new file mode 100644 index 000000000..3249871a8 --- /dev/null +++ b/_1_basics/src/main/java/code/_3_in_class/Boxer.java @@ -0,0 +1,24 @@ +package code._3_in_class; + +public class Boxer { + String nume; + int health = 100; + int dammagePerAttack =10; + + //constructor + public Boxer(String nume, int health, int dammagePerAttack) { + this.nume = nume; + this.health = health; + this.dammagePerAttack = dammagePerAttack; + } + + public Boxer(String nume) { + this.nume = nume; + } + + void attack(Boxer opponent) { + opponent.health = opponent.health - this.dammagePerAttack; + System.out.println(this.nume + "il ataca pe" + opponent.nume +"-new health is =" + opponent.health); + } + void defend(){} +} \ No newline at end of file diff --git a/_1_basics/src/main/java/code/_3_in_class/JohnCena b/_1_basics/src/main/java/code/_3_in_class/JohnCena new file mode 100644 index 000000000..39898cfea --- /dev/null +++ b/_1_basics/src/main/java/code/_3_in_class/JohnCena @@ -0,0 +1,13 @@ +package code._3_in_class; + +public class JohnCena extends Boxer { + public BruceLee (String nume, int health, int dammagePerAttack) { + this.nume = nume; + this.health = health; + this.dammagePerAttack = dammagePerAttack; + } + + public JohnCena (String nume) { + this.nume = nume; + } +} \ No newline at end of file diff --git a/_1_basics/src/main/java/code/_3_in_class/MainBoxer.java b/_1_basics/src/main/java/code/_3_in_class/MainBoxer.java new file mode 100644 index 000000000..ac1520405 --- /dev/null +++ b/_1_basics/src/main/java/code/_3_in_class/MainBoxer.java @@ -0,0 +1,37 @@ +package code._3_in_class; +import java.util.Random; + +public class MainBoxer { + + 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"); + + + startBoxingMatch(ion, vasile); + endingResults(ion); + } + + private static void endingResults(Boxer ion) { + if (ion.health <= 0) { + System.out.println("Vasile a castigat meciul"); + } else { + System.out.println("Ion a castigat meciul"); + } + } + + + + 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 From 96b722bae52b8ddcc804ce22076eb26c2547fb55 Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 20 May 2023 00:09:11 +0300 Subject: [PATCH 3/8] boxer --- .../src/main/java/code/_3_in_class/{JohnCena => JohnCena.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _1_basics/src/main/java/code/_3_in_class/{JohnCena => JohnCena.java} (100%) diff --git a/_1_basics/src/main/java/code/_3_in_class/JohnCena b/_1_basics/src/main/java/code/_3_in_class/JohnCena.java similarity index 100% rename from _1_basics/src/main/java/code/_3_in_class/JohnCena rename to _1_basics/src/main/java/code/_3_in_class/JohnCena.java From f97c0083214d6166c83ea289208dc7f040cd90a1 Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 20 May 2023 00:14:05 +0300 Subject: [PATCH 4/8] boxer --- {_1_basics => _2_oo}/src/main/java/code/_3_in_class/Boxer.java | 0 {_1_basics => _2_oo}/src/main/java/code/_3_in_class/JohnCena.java | 0 .../src/main/java/code/_3_in_class/MainBoxer.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {_1_basics => _2_oo}/src/main/java/code/_3_in_class/Boxer.java (100%) rename {_1_basics => _2_oo}/src/main/java/code/_3_in_class/JohnCena.java (100%) rename {_1_basics => _2_oo}/src/main/java/code/_3_in_class/MainBoxer.java (100%) diff --git a/_1_basics/src/main/java/code/_3_in_class/Boxer.java b/_2_oo/src/main/java/code/_3_in_class/Boxer.java similarity index 100% rename from _1_basics/src/main/java/code/_3_in_class/Boxer.java rename to _2_oo/src/main/java/code/_3_in_class/Boxer.java diff --git a/_1_basics/src/main/java/code/_3_in_class/JohnCena.java b/_2_oo/src/main/java/code/_3_in_class/JohnCena.java similarity index 100% rename from _1_basics/src/main/java/code/_3_in_class/JohnCena.java rename to _2_oo/src/main/java/code/_3_in_class/JohnCena.java diff --git a/_1_basics/src/main/java/code/_3_in_class/MainBoxer.java b/_2_oo/src/main/java/code/_3_in_class/MainBoxer.java similarity index 100% rename from _1_basics/src/main/java/code/_3_in_class/MainBoxer.java rename to _2_oo/src/main/java/code/_3_in_class/MainBoxer.java From 838cd07340f8ed90963ee11ca90a279c4470b34c Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 20 May 2023 00:20:12 +0300 Subject: [PATCH 5/8] testare clasa --- .../src/main/java/code/_3_in_class/{Ex.java => Ex1.java} | 4 ++-- _1_basics/src/main/java/code/_3_in_class/Ex2.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) rename _1_basics/src/main/java/code/_3_in_class/{Ex.java => Ex1.java} (56%) create mode 100644 _1_basics/src/main/java/code/_3_in_class/Ex2.java diff --git a/_1_basics/src/main/java/code/_3_in_class/Ex.java b/_1_basics/src/main/java/code/_3_in_class/Ex1.java similarity index 56% rename from _1_basics/src/main/java/code/_3_in_class/Ex.java rename to _1_basics/src/main/java/code/_3_in_class/Ex1.java index 6b812df42..488b7775e 100644 --- a/_1_basics/src/main/java/code/_3_in_class/Ex.java +++ b/_1_basics/src/main/java/code/_3_in_class/Ex1.java @@ -1,7 +1,7 @@ package code._3_in_class; -public class Ex { +public class Ex1 { public static void main(String[] args) { - System.out.println("salut"); + System.out.println("salut lume1"); } } diff --git a/_1_basics/src/main/java/code/_3_in_class/Ex2.java b/_1_basics/src/main/java/code/_3_in_class/Ex2.java new file mode 100644 index 000000000..a773f3fd9 --- /dev/null +++ b/_1_basics/src/main/java/code/_3_in_class/Ex2.java @@ -0,0 +1,7 @@ +package code._3_in_class; + +public class Ex2 { + public static void main(String[] args) { + System.out.println("salut lume2"); + } +} From 2cc8597d56ed3615a2921302bb29a071840ac7b4 Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 20 May 2023 00:57:27 +0300 Subject: [PATCH 6/8] builder si prototype -> proiect --- .../requirements/builder/Main.java | 17 ++++++++++ .../requirements/builder/Salata.java | 31 +++++++++++++++++ .../requirements/builder/SalataBuilder.java | 33 +++++++++++++++++++ .../requirements/prototype/AfisPublicitar | 26 +++++++++++++++ .../requirements/prototype/Logo.java | 22 +++++++++++++ .../requirements/prototype/Main.java | 27 +++++++++++++++ 6 files changed, 156 insertions(+) create mode 100644 clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java create mode 100644 clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java create mode 100644 clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java create mode 100644 clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar create mode 100644 clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java create mode 100644 clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java new file mode 100644 index 000000000..0b971eb27 --- /dev/null +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java @@ -0,0 +1,17 @@ +public class Main { + public static void main(String[] args) { + // Crearea unui obiect Salata utilizând SalataBuilder + Salata salata = new Salata.SalataBuilder() + .salata("Mix de salată verde") + .sos("Iaurt") + .branza(true) + .crutoane(true) + .build(); + + // Accesarea atributelor obiectului Salata + System.out.println("Salată: " + salata.getSalata()); + System.out.println("Sos: " + salata.getSos()); + System.out.println("Branză: " + salata.areBranza()); + System.out.println("Crutoane: " + salata.areCrutoane()); + } +} diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java new file mode 100644 index 000000000..97ac76923 --- /dev/null +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java @@ -0,0 +1,31 @@ +// Definirea clasei Salata +public class Salata { + private String salata; + private String sos; + private boolean branza; + private boolean crutoane; + + + private Salata(SalataBuilder builder) { + this.salata = builder.salata; + this.sos = builder.sos; + this.branza = builder.branza; + this.crutoane = builder.crutoane; + } + + + public String getSalata() { + return salata; + } + + public String getSos() { + return sos; + } + + public boolean areBranza() { + return branza; + } + + public boolean areCrutoane() { + return crutoane; + } diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java new file mode 100644 index 000000000..681bf6a9f --- /dev/null +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java @@ -0,0 +1,33 @@ + public static class SalataBuilder { + private String salata; + private String sos; + private boolean branza; + private boolean crutoane; + + + public SalataBuilder salata(String salata) { + this.salata = salata; + return this; + } + + public SalataBuilder sos(String sos) { + this.sos = sos; + return this; + } + + public SalataBuilder branza(boolean branza) { + this.branza = branza; + return this; + } + + public SalataBuilder crutoane(boolean crutoane) { + this.crutoane = crutoane; + return this; + } + + // Metoda build() care returnează un obiect de tip Salata pe baza valorilor specificate în obiectul SalataBuilder + public Salata build() { + return new Salata(this); + } + } +} \ No newline at end of file diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar new file mode 100644 index 000000000..cc5f1efd6 --- /dev/null +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar @@ -0,0 +1,26 @@ +class AfisPublicitar { + private String text; + private Logo logo; + + public AfisPublicitar(String text, Logo logo) { + this.text = text; + this.logo = logo; + } + + public void setText(String text) { + this.text = text; + } + + public String getText() { + return text; + } + + public Logo getLogo() { + return logo; + } + + public void setLogo(Logo logo) { + this.logo = logo; + } +} + diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java new file mode 100644 index 000000000..849b714df --- /dev/null +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java @@ -0,0 +1,22 @@ +// Clasa Logo, care va fi clonată +class Logo implements Cloneable { + private String imagine; + + public Logo(String imagine) { + this.imagine = imagine; + } + + public void setImagine(String imagine) { + this.imagine = imagine; + } + + public String getImagine() { + return imagine; + } + + @Override + public Logo clone() throws CloneNotSupportedException { + return (Logo) super.clone(); + } +} + diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java new file mode 100644 index 000000000..16c6f3310 --- /dev/null +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java @@ -0,0 +1,27 @@ +public class Main { + public static void main(String[] args) { + // Initializarea unui obiect AfisPublicitar + Logo logo = new Logo("logo_original"); + AfisPublicitar afisOriginal = new AfisPublicitar("Acesta este un afiș publicitar", logo); + + try { + // Clonarea obiectului de tip Logo + Logo logoClonat = afisOriginal.getLogo().clone(); + logoClonat.setImagine("logo_clonat"); + + // Crearea unui nou afis publicitar cu logo-ul clonat + AfisPublicitar afisClonat = new AfisPublicitar("Acesta este un afiș publicitar clonat", logoClonat); + + // Afisarea informatiilor despre afisul original si cel clonat + System.out.println("Afiș publicitar original:"); + System.out.println("Text: " + afisOriginal.getText()); + System.out.println("Logo: " + afisOriginal.getLogo().getImagine()); + + System.out.println("\nAfiș publicitar clonat:"); + System.out.println("Text: " + afisClonat.getText()); + System.out.println("Logo: " + afisClonat.getLogo().getImagine()); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + } +} From 54f68dcf4531b19fad0dd532773e88fbc4cec5cf Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 20 May 2023 10:29:43 +0300 Subject: [PATCH 7/8] builder si prototype -> proiect --- .../requirements/builder/Main.java | 2 +- .../requirements/builder/Salata.java | 23 ++++----- .../requirements/builder/SalataBuilder.java | 51 +++++++++---------- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java index 0b971eb27..4d8da4e58 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java @@ -1,7 +1,7 @@ public class Main { public static void main(String[] args) { // Crearea unui obiect Salata utilizând SalataBuilder - Salata salata = new Salata.SalataBuilder() + Salata salata = new SalataBuilder() .salata("Mix de salată verde") .sos("Iaurt") .branza(true) diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java index 97ac76923..9fe25abee 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java @@ -1,19 +1,17 @@ -// Definirea clasei Salata +//builder public class Salata { - private String salata; - private String sos; - private boolean branza; - private boolean crutoane; + private String salata; // baza + private String sos; // sos + private boolean branza; // indicator pentru prezența brânzei + private boolean crutoane; // indicator pentru prezența crutoanelor - - private Salata(SalataBuilder builder) { - this.salata = builder.salata; - this.sos = builder.sos; - this.branza = builder.branza; - this.crutoane = builder.crutoane; + Salata(String salata, String sos, boolean branza, boolean crutoane) { + this.salata = salata; + this.sos = sos; + this.branza = branza; + this.crutoane = crutoane; } - public String getSalata() { return salata; } @@ -29,3 +27,4 @@ public boolean areBranza() { public boolean areCrutoane() { return crutoane; } +} diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java index 681bf6a9f..ffdf99f40 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java @@ -1,33 +1,30 @@ - public static class SalataBuilder { - private String salata; - private String sos; - private boolean branza; - private boolean crutoane; +public class SalataBuilder { + private String salata; + private String sos; + private boolean branza; + private boolean crutoane; + public SalataBuilder salata(String salata) { + this.salata = salata; + return this; + } - public SalataBuilder salata(String salata) { - this.salata = salata; - return this; - } - - public SalataBuilder sos(String sos) { - this.sos = sos; - return this; - } + public SalataBuilder sos(String sos) { + this.sos = sos; + return this; + } - public SalataBuilder branza(boolean branza) { - this.branza = branza; - return this; - } + public SalataBuilder branza(boolean branza) { + this.branza = branza; + return this; + } - public SalataBuilder crutoane(boolean crutoane) { - this.crutoane = crutoane; - return this; - } + public SalataBuilder crutoane(boolean crutoane) { + this.crutoane = crutoane; + return this; + } - // Metoda build() care returnează un obiect de tip Salata pe baza valorilor specificate în obiectul SalataBuilder - public Salata build() { - return new Salata(this); - } + public Salata build() { + return new Salata(salata, sos, branza, crutoane); } -} \ No newline at end of file +} From 6d8f4b834d07b4eab8c5ccab004f96cde8bc5105 Mon Sep 17 00:00:00 2001 From: weltheremanuel19 Date: Sat, 20 May 2023 12:25:40 +0300 Subject: [PATCH 8/8] proiect builder si prototype --- .../clean/code/design_patterns/requirements/builder/Main.java | 1 + .../code/design_patterns/requirements/builder/Salata.java | 1 + .../design_patterns/requirements/builder/SalataBuilder.java | 1 + .../prototype/{AfisPublicitar => AfisPublicitar.java} | 3 ++- .../code/design_patterns/requirements/prototype/Logo.java | 4 +++- .../code/design_patterns/requirements/prototype/Main.java | 4 +++- 6 files changed, 11 insertions(+), 3 deletions(-) rename clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/{AfisPublicitar => AfisPublicitar.java} (82%) diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java index 4d8da4e58..8d5639935 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Main.java @@ -1,3 +1,4 @@ +package clean.code.design_patterns.requirements.builder; public class Main { public static void main(String[] args) { // Crearea unui obiect Salata utilizând SalataBuilder diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java index 9fe25abee..9d6ee8584 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/Salata.java @@ -1,3 +1,4 @@ +package clean.code.design_patterns.requirements.builder; //builder public class Salata { private String salata; // baza diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java index ffdf99f40..79b33894f 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/builder/SalataBuilder.java @@ -1,3 +1,4 @@ +package clean.code.design_patterns.requirements.builder; public class SalataBuilder { private String salata; private String sos; diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar.java similarity index 82% rename from clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar rename to clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar.java index cc5f1efd6..194ee19db 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/AfisPublicitar.java @@ -1,4 +1,5 @@ -class AfisPublicitar { +package clean.code.design_patterns.requirements.prototype; +public class AfisPublicitar { private String text; private Logo logo; diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java index 849b714df..323df1bdc 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Logo.java @@ -1,5 +1,7 @@ +package clean.code.design_patterns.requirements.prototype; + // Clasa Logo, care va fi clonată -class Logo implements Cloneable { +public class Logo implements Cloneable { private String imagine; public Logo(String imagine) { diff --git a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java index 16c6f3310..3a2730fce 100644 --- a/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java +++ b/clean_code_projects/_2_project_requirements_design_patterns/src/main/java/clean/code/design_patterns/requirements/prototype/Main.java @@ -1,6 +1,8 @@ +package clean.code.design_patterns.requirements.prototype; + public class Main { public static void main(String[] args) { - // Initializarea unui obiect AfisPublicitar + // Initializarea unui obiect AfisPublicitar.java Logo logo = new Logo("logo_original"); AfisPublicitar afisOriginal = new AfisPublicitar("Acesta este un afiș publicitar", logo);