From 87f16b7b26933a7e9db8bcb56ec5a7d7af379226 Mon Sep 17 00:00:00 2001
From: aeen bolandian <bolandian85@gmail.com>
Date: Wed, 12 Mar 2025 09:28:48 +0330
Subject: [PATCH 1/4]  abstract method breathe has been added to Creature
 interface and breathe method has been overrided in mammal class

---
 .idea/First-Workshop-Zoology.iml | 9 +++++++++
 .idea/gradle.xml                 | 1 +
 .idea/misc.xml                   | 2 +-
 .idea/modules.xml                | 8 ++++++++
 src/main/java/Main/Cat.java      | 3 ++-
 src/main/java/Main/Creature.java | 1 +
 src/main/java/Main/Mammal.java   | 6 +++++-
 7 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 .idea/First-Workshop-Zoology.iml
 create mode 100644 .idea/modules.xml

diff --git a/.idea/First-Workshop-Zoology.iml b/.idea/First-Workshop-Zoology.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/First-Workshop-Zoology.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f9163b4..ce1c62c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9fc492e..8a1acd8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="openjdk-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="openjdk-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3b27750
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/First-Workshop-Zoology.iml" filepath="$PROJECT_DIR$/.idea/First-Workshop-Zoology.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/Main/Cat.java b/src/main/java/Main/Cat.java
index 7825fb7..f610065 100644
--- a/src/main/java/Main/Cat.java
+++ b/src/main/java/Main/Cat.java
@@ -1,4 +1,5 @@
 package Main;
 
-public class Cat {
+public class Cat extends Mammal implements Carnivore {
+
 }
diff --git a/src/main/java/Main/Creature.java b/src/main/java/Main/Creature.java
index e80b539..fd02604 100644
--- a/src/main/java/Main/Creature.java
+++ b/src/main/java/Main/Creature.java
@@ -2,4 +2,5 @@
 
 public interface Creature {
     abstract void live();
+    abstract void breathe();
 }
diff --git a/src/main/java/Main/Mammal.java b/src/main/java/Main/Mammal.java
index 9a12bee..803f197 100644
--- a/src/main/java/Main/Mammal.java
+++ b/src/main/java/Main/Mammal.java
@@ -5,6 +5,10 @@ public abstract class Mammal implements Creature {
     public abstract void makeSound();
     @Override
     public void live() {
-        // TODO
+        System.out.println("Mammals are living");
+    }
+    @Override
+    public void breathe() {
+        System.out.println("Mammals breathe to be alive");
     }
 }

From afe2bd5710df4ff9933b03b8756be1a8e747ffdf Mon Sep 17 00:00:00 2001
From: aeen bolandian <bolandian85@gmail.com>
Date: Wed, 12 Mar 2025 09:46:00 +0330
Subject: [PATCH 2/4]  gender , age , name and weight added to mammal class +
 getter and setters + constructor

---
 src/main/java/Main/Cat.java    |  1 -
 src/main/java/Main/Mammal.java | 38 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/main/java/Main/Cat.java b/src/main/java/Main/Cat.java
index f610065..4ea3d96 100644
--- a/src/main/java/Main/Cat.java
+++ b/src/main/java/Main/Cat.java
@@ -1,5 +1,4 @@
 package Main;
 
 public class Cat extends Mammal implements Carnivore {
-
 }
diff --git a/src/main/java/Main/Mammal.java b/src/main/java/Main/Mammal.java
index 803f197..bef4348 100644
--- a/src/main/java/Main/Mammal.java
+++ b/src/main/java/Main/Mammal.java
@@ -1,6 +1,44 @@
 package Main;
 
 public abstract class Mammal implements Creature {
+    private String name;
+    private String gender;
+    private int age;
+    private int weight;
+
+    public int getAge() {
+        return age;
+    }
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getGender() {
+        return gender;
+    }
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public Mammal(String name, String gender , int age, int weight) {
+        this.name = name;
+        this.gender = gender;
+        this.age = age;
+        this.weight = weight;
+    }
+
     public abstract void move();
     public abstract void makeSound();
     @Override

From 1eefc84928628cf067d14705d9baaeef5130a296 Mon Sep 17 00:00:00 2001
From: aeen bolandian <bolandian85@gmail.com>
Date: Wed, 12 Mar 2025 10:03:04 +0330
Subject: [PATCH 3/4] Human class completed

---
 src/main/java/Main/Human.java  | 36 ++++++++++++++++++++++++----------
 src/main/java/Main/Mammal.java | 17 +++++++++-------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/main/java/Main/Human.java b/src/main/java/Main/Human.java
index 3103dc1..68a0a76 100644
--- a/src/main/java/Main/Human.java
+++ b/src/main/java/Main/Human.java
@@ -1,32 +1,48 @@
 package Main;
 
 public class Human extends Mammal implements Carnivore, Herbivore {
-    private String name;
-    private int age;
-    public Human(String name, int age) {
-        this.name = name;
-        this.age = age;
+    private int height;
+    private String nationality;
+
+    public int getHeight() {
+        return height;
+    }
+    public void setHeight(int height) {
+        this.height = height;
+    }
+    public String getNationality() {
+        return nationality;
+    }
+    public void setNationality(String nationality) {
+        this.nationality = nationality;
     }
+
+    public Human(String name, String gender , int age , int weight , int height , String nationality) {
+        super(name , gender , age , weight);
+        this.height = height;
+        this.nationality = nationality;
+    }
+
     @Override
     public void move() {
-        System.out.println(this.name + "is walking");
+        System.out.println(getName()  + " is walking");
     }
     @Override
     public void makeSound() {
-        System.out.println(this.name + "is speaking");
+        System.out.println(getName() + " is speaking");
     }
 
     @Override
     public void eatMeat() {
-        System.out.println(this.name + "is eating meat");
+        System.out.println(getName() + " is eating meat");
     }
 
     @Override
     public void eatPlants() {
-        System.out.println(this.name + "is eating plants");
+        System.out.println(getName() + " is eating plants");
     }
 
     public void work() {
-        System.out.println(this.name + "is working");
+        System.out.println(getName() + " is working");
     }
 }
diff --git a/src/main/java/Main/Mammal.java b/src/main/java/Main/Mammal.java
index bef4348..b6e8a53 100644
--- a/src/main/java/Main/Mammal.java
+++ b/src/main/java/Main/Mammal.java
@@ -10,14 +10,16 @@ public int getAge() {
         return age;
     }
     public void setAge(int age) {
-        this.age = age;
+        if (age > 0)
+            this.age = age;
     }
 
     public int getWeight() {
         return weight;
     }
     public void setWeight(int weight) {
-        this.weight = weight;
+        if(weight > 0)
+            this.weight = weight;
     }
     public String getName() {
         return name;
@@ -29,14 +31,15 @@ public String getGender() {
         return gender;
     }
     public void setGender(String gender) {
-        this.gender = gender;
+        if(gender.equals("male") || gender.equals("female"))
+            this.gender = gender;
     }
 
     public Mammal(String name, String gender , int age, int weight) {
-        this.name = name;
-        this.gender = gender;
-        this.age = age;
-        this.weight = weight;
+        setName(name);
+        setGender(gender);
+        setAge(age);
+        setWeight(weight);
     }
 
     public abstract void move();

From 6c6a16632e018129c7e03e5d201ace5255c6e110 Mon Sep 17 00:00:00 2001
From: aeen bolandian <bolandian85@gmail.com>
Date: Wed, 12 Mar 2025 20:09:50 +0330
Subject: [PATCH 4/4] Cat class completed

---
 src/main/java/Main/Cat.java | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/main/java/Main/Cat.java b/src/main/java/Main/Cat.java
index 4ea3d96..62bc72e 100644
--- a/src/main/java/Main/Cat.java
+++ b/src/main/java/Main/Cat.java
@@ -1,4 +1,29 @@
 package Main;
 
 public class Cat extends Mammal implements Carnivore {
+    private String breed;
+
+    public String getBreed() {
+        return breed;
+    }
+    public void setBreed(String breed) {
+        this.breed = breed;
+    }
+    public Cat(String name, String gender , int age , int weight , String breed) {
+        super(name , gender , age , weight);
+        this.breed = breed;
+
+        @Override
+        public void move() {
+            System.out.println(getName()  + " is walking on four legs");
+        }
+        @Override
+        public void makeSound() {
+            System.out.println(getName() + " is making mew sound");
+        }
+        @Override
+        public void eatMeat() {
+            System.out.println(getName() + " is eating meat");
+        }
+    }
 }