From 15ddef272bbe0f6cce8c60bbc95245e3cdbcd9ab Mon Sep 17 00:00:00 2001 From: Claudiu Bicsabi Date: Tue, 17 Apr 2018 18:26:07 +0300 Subject: [PATCH] JavaBasicsLab Session 5 --- src/JavaBasicsLab/S04/CabinetVeterinar.java | 21 ------- src/JavaBasicsLab/S04/MainClassSession4.java | 36 ----------- .../S04_05/CabinetVeterinar.java | 28 +++++++++ src/JavaBasicsLab/{S04 => S04_05}/Caine.java | 2 +- .../Homework/CashRegister.java | 2 +- .../{S04 => S04_05}/Homework/Inventory.java | 2 +- .../{S04 => S04_05}/Homework/Main.java | 2 +- .../{S04 => S04_05}/Homework/ShopItem.java | 2 +- .../Homework/ShoppingCart.java | 2 +- .../S04_05/MainClassSession4.java | 59 +++++++++++++++++++ 10 files changed, 93 insertions(+), 63 deletions(-) delete mode 100644 src/JavaBasicsLab/S04/CabinetVeterinar.java delete mode 100644 src/JavaBasicsLab/S04/MainClassSession4.java create mode 100644 src/JavaBasicsLab/S04_05/CabinetVeterinar.java rename src/JavaBasicsLab/{S04 => S04_05}/Caine.java (97%) rename src/JavaBasicsLab/{S04 => S04_05}/Homework/CashRegister.java (94%) rename src/JavaBasicsLab/{S04 => S04_05}/Homework/Inventory.java (98%) rename src/JavaBasicsLab/{S04 => S04_05}/Homework/Main.java (96%) rename src/JavaBasicsLab/{S04 => S04_05}/Homework/ShopItem.java (97%) rename src/JavaBasicsLab/{S04 => S04_05}/Homework/ShoppingCart.java (86%) create mode 100644 src/JavaBasicsLab/S04_05/MainClassSession4.java diff --git a/src/JavaBasicsLab/S04/CabinetVeterinar.java b/src/JavaBasicsLab/S04/CabinetVeterinar.java deleted file mode 100644 index 763832d..0000000 --- a/src/JavaBasicsLab/S04/CabinetVeterinar.java +++ /dev/null @@ -1,21 +0,0 @@ -package JavaBasicsLab.S04; - -public class CabinetVeterinar { - Caine[] registruCaini = new Caine[100]; - private int indexRegistru = 0; - String numeDoctor; - Caine caineleCabinetului; - - public void vaccineaza(Caine c){ - c.setVaccinat(true); - } - - public void adaugaInRegistru(Caine c){ - if (indexRegistru == 100) { - System.out.println("Registrul este plin. Pentru a putea inscrie un nou Caine, inlocuiti o intrare veche."); - } else { - registruCaini[indexRegistru] = c; - indexRegistru++; - } - } -} diff --git a/src/JavaBasicsLab/S04/MainClassSession4.java b/src/JavaBasicsLab/S04/MainClassSession4.java deleted file mode 100644 index 6114fc8..0000000 --- a/src/JavaBasicsLab/S04/MainClassSession4.java +++ /dev/null @@ -1,36 +0,0 @@ -package JavaBasicsLab.S04; - -import JavaBasicsLab.S04.Caine; - -public class MainClassSession4 { - public static void main(String[] args) { - Caine c1 = new Caine("Gigel", -4); - - c1.setRasa("Beremanez"); - c1.setVaccinat(true); - - System.out.println(c1.getNume()); - System.out.println(c1.getRasa()); - System.out.println(c1.getVarsta()); - System.out.println(c1.isVaccinat()); - - Caine c2 = new Caine("Azor", -6); - System.out.println(c2.getVarsta()); - - c2.setVarsta(2); - System.out.println(c2.getVarsta()); - - CabinetVeterinar doggyVet = new CabinetVeterinar(); - - System.out.println("Stadiul vaccinarii cainelui: " + c2.isVaccinat()); - doggyVet.vaccineaza(c2); - System.out.println("Stadiul vaccinarii cainelui: " + c2.isVaccinat()); - - doggyVet.registruCaini[0] = c1; - doggyVet.registruCaini[1] = c2; - - for(Caine c : doggyVet.registruCaini){ - System.out.println(c.getNume()); - } - } -} diff --git a/src/JavaBasicsLab/S04_05/CabinetVeterinar.java b/src/JavaBasicsLab/S04_05/CabinetVeterinar.java new file mode 100644 index 0000000..5b97c3c --- /dev/null +++ b/src/JavaBasicsLab/S04_05/CabinetVeterinar.java @@ -0,0 +1,28 @@ +package JavaBasicsLab.S04_05; + +public class CabinetVeterinar { + Caine[] registruCaini; + String numeDoctor; + Caine caineleCabinetului; + private int numarCaini; + + public CabinetVeterinar() { + this.registruCaini = new Caine[20]; + this.numarCaini = 0; + } + + public void vaccineaza(Caine c){ + c.setVaccinat(true); + } + + public void adaugaCaine(Caine c){ + registruCaini[numarCaini] = c; + numarCaini++; + } + + public void print() { + for (int i = 0; i < numarCaini; i++) { + System.out.println(registruCaini[i].getNume()); + } + } +} diff --git a/src/JavaBasicsLab/S04/Caine.java b/src/JavaBasicsLab/S04_05/Caine.java similarity index 97% rename from src/JavaBasicsLab/S04/Caine.java rename to src/JavaBasicsLab/S04_05/Caine.java index e4e37ae..efe0519 100644 --- a/src/JavaBasicsLab/S04/Caine.java +++ b/src/JavaBasicsLab/S04_05/Caine.java @@ -1,4 +1,4 @@ -package JavaBasicsLab.S04; +package JavaBasicsLab.S04_05; public class Caine { private String rasa; diff --git a/src/JavaBasicsLab/S04/Homework/CashRegister.java b/src/JavaBasicsLab/S04_05/Homework/CashRegister.java similarity index 94% rename from src/JavaBasicsLab/S04/Homework/CashRegister.java rename to src/JavaBasicsLab/S04_05/Homework/CashRegister.java index dfbbd73..b67b5d6 100644 --- a/src/JavaBasicsLab/S04/Homework/CashRegister.java +++ b/src/JavaBasicsLab/S04_05/Homework/CashRegister.java @@ -1,4 +1,4 @@ -package JavaBasicsLab.S04.Homework; +package JavaBasicsLab.S04_05.Homework; public class CashRegister { private String name; diff --git a/src/JavaBasicsLab/S04/Homework/Inventory.java b/src/JavaBasicsLab/S04_05/Homework/Inventory.java similarity index 98% rename from src/JavaBasicsLab/S04/Homework/Inventory.java rename to src/JavaBasicsLab/S04_05/Homework/Inventory.java index e074ced..2959334 100644 --- a/src/JavaBasicsLab/S04/Homework/Inventory.java +++ b/src/JavaBasicsLab/S04_05/Homework/Inventory.java @@ -1,4 +1,4 @@ -package JavaBasicsLab.S04.Homework; +package JavaBasicsLab.S04_05.Homework; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/JavaBasicsLab/S04/Homework/Main.java b/src/JavaBasicsLab/S04_05/Homework/Main.java similarity index 96% rename from src/JavaBasicsLab/S04/Homework/Main.java rename to src/JavaBasicsLab/S04_05/Homework/Main.java index 9f128bd..4edb9c8 100644 --- a/src/JavaBasicsLab/S04/Homework/Main.java +++ b/src/JavaBasicsLab/S04_05/Homework/Main.java @@ -1,4 +1,4 @@ -package JavaBasicsLab.S04.Homework; +package JavaBasicsLab.S04_05.Homework; public class Main { public static void main(String[] args) { diff --git a/src/JavaBasicsLab/S04/Homework/ShopItem.java b/src/JavaBasicsLab/S04_05/Homework/ShopItem.java similarity index 97% rename from src/JavaBasicsLab/S04/Homework/ShopItem.java rename to src/JavaBasicsLab/S04_05/Homework/ShopItem.java index eb9a14e..aaeb1e8 100644 --- a/src/JavaBasicsLab/S04/Homework/ShopItem.java +++ b/src/JavaBasicsLab/S04_05/Homework/ShopItem.java @@ -1,4 +1,4 @@ -package JavaBasicsLab.S04.Homework; +package JavaBasicsLab.S04_05.Homework; public class ShopItem { private String category; diff --git a/src/JavaBasicsLab/S04/Homework/ShoppingCart.java b/src/JavaBasicsLab/S04_05/Homework/ShoppingCart.java similarity index 86% rename from src/JavaBasicsLab/S04/Homework/ShoppingCart.java rename to src/JavaBasicsLab/S04_05/Homework/ShoppingCart.java index 573b492..d7b8539 100644 --- a/src/JavaBasicsLab/S04/Homework/ShoppingCart.java +++ b/src/JavaBasicsLab/S04_05/Homework/ShoppingCart.java @@ -1,4 +1,4 @@ -package JavaBasicsLab.S04.Homework; +package JavaBasicsLab.S04_05.Homework; public class ShoppingCart extends Inventory { diff --git a/src/JavaBasicsLab/S04_05/MainClassSession4.java b/src/JavaBasicsLab/S04_05/MainClassSession4.java new file mode 100644 index 0000000..9802807 --- /dev/null +++ b/src/JavaBasicsLab/S04_05/MainClassSession4.java @@ -0,0 +1,59 @@ +package JavaBasicsLab.S04_05; + +public class MainClassSession4 { + public static void main(String[] args) { + Caine c1 = new Caine("Gigel", -4); + + c1.setRasa("Beremanez"); + c1.setVaccinat(true); + + System.out.println(c1.getNume()); + System.out.println(c1.getRasa()); + System.out.println(c1.getVarsta()); + System.out.println(c1.isVaccinat()); + + Caine c2 = new Caine("Azor", -6); + System.out.println(c2.getVarsta()); + + c2.setVarsta(2); + System.out.println(c2.getVarsta()); + + CabinetVeterinar doggyVet = new CabinetVeterinar(); + + System.out.println("Stadiul vaccinarii cainelui: " + c2.isVaccinat()); + doggyVet.vaccineaza(c2); + System.out.println("Stadiul vaccinarii cainelui: " + c2.isVaccinat()); + + doggyVet.adaugaCaine(c1); + doggyVet.adaugaCaine(c2); + + doggyVet.print(); + + System.out.println(c1); + System.out.println(doggyVet.registruCaini[0]); + System.out.println(doggyVet.registruCaini[3]); + + int in = 3; + + System.out.println("-------"); + + Caine c3 = c2; + System.out.println(c2.getNume()); + System.out.println(c3.getNume()); + c3.setNume("Grasu"); + System.out.println(c2.getNume()); + System.out.println(c3.getNume()); + c2.setNume("Slabul"); + System.out.println(c2.getNume()); + System.out.println(c3.getNume()); + + System.out.println("======="); + + c3.setNume(c1.getNume()); + System.out.println(c3.getNume()); + c1.setNume("Marius"); + System.out.println(c1.getNume()); + System.out.println(c3.getNume()); + + } +}