From 0d67bfa9932cf6b6d5767c69f20b22d17d36ddb9 Mon Sep 17 00:00:00 2001 From: yurysid <52960653+yurysid@users.noreply.github.com> Date: Tue, 23 Jul 2019 16:11:46 +0300 Subject: [PATCH 1/4] Add files via upload --- Cat.java | 8 ++++++++ Cow.java | 8 ++++++++ Dog.java | 8 ++++++++ Main.java | 25 +++++++++++++++++++++++++ Math.java | 18 ++++++++++++++++++ Pet.java | 6 ++++++ 6 files changed, 73 insertions(+) create mode 100644 Cat.java create mode 100644 Cow.java create mode 100644 Dog.java create mode 100644 Main.java create mode 100644 Math.java create mode 100644 Pet.java diff --git a/Cat.java b/Cat.java new file mode 100644 index 0000000..40b1198 --- /dev/null +++ b/Cat.java @@ -0,0 +1,8 @@ +package com.company; + +public class Cat extends Pet { + @Override + public void voice(){ + System.out.println("I am a cat - Meow "); + } +} diff --git a/Cow.java b/Cow.java new file mode 100644 index 0000000..e0a1a65 --- /dev/null +++ b/Cow.java @@ -0,0 +1,8 @@ +package com.company; + +public class Cow extends Pet { + @Override + public void voice() { + System.out.println("I am a cow - Moo "); + } +} diff --git a/Dog.java b/Dog.java new file mode 100644 index 0000000..d14f9e1 --- /dev/null +++ b/Dog.java @@ -0,0 +1,8 @@ +package com.company; + +public class Dog extends Pet { + @Override + public void voice() { + System.out.println("I am a dog - Bark "); + } +} diff --git a/Main.java b/Main.java new file mode 100644 index 0000000..c0ca560 --- /dev/null +++ b/Main.java @@ -0,0 +1,25 @@ +package com.company; + +public class Main { + + public static void main(String[] args) { + Math mult = new Math(); + Math add = new Math(); + Math sub = new Math(); + + mult.mult(); + add.add(); + sub.sub(); + + System.out.println(""); + + Pet cat = new Cat(); + Pet dog = new Dog(); + Pet cow = new Cow(); + + cat.voice(); + dog.voice(); + cow.voice(); + +} +} diff --git a/Math.java b/Math.java new file mode 100644 index 0000000..76c0ade --- /dev/null +++ b/Math.java @@ -0,0 +1,18 @@ +package com.company; + +public class Math { + static final int A = 3; + static final int B = 4; + static final int C = 5; + + static void mult(){ + System.out.println("The result of mult is: " + (A*B*C)); + } + static void add(){ + System.out.println("The result of add is: " + (A+B+C)); + } + static void sub(){ + System.out.println("The result of sub is: " + (A-B-C)); + } + +} diff --git a/Pet.java b/Pet.java new file mode 100644 index 0000000..ff5c2f2 --- /dev/null +++ b/Pet.java @@ -0,0 +1,6 @@ +package com.company; + +public abstract class Pet { + public abstract void voice(); + +} From cb70005b74457c5156879b4ba0b58addaa67baeb Mon Sep 17 00:00:00 2001 From: yurysid <52960653+yurysid@users.noreply.github.com> Date: Tue, 23 Jul 2019 16:14:41 +0300 Subject: [PATCH 2/4] Update Main.java --- Main.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Main.java b/Main.java index c0ca560..bb25e0a 100644 --- a/Main.java +++ b/Main.java @@ -7,9 +7,9 @@ public static void main(String[] args) { Math add = new Math(); Math sub = new Math(); - mult.mult(); - add.add(); - sub.sub(); + mult.multiplication(); + add.addition(); + sub.subtraction(); System.out.println(""); From ad63085d8dee194fc67efa59425f2bcb810eebd4 Mon Sep 17 00:00:00 2001 From: yurysid <52960653+yurysid@users.noreply.github.com> Date: Tue, 23 Jul 2019 16:15:42 +0300 Subject: [PATCH 3/4] Update Math.java --- Math.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Math.java b/Math.java index 76c0ade..7502bfd 100644 --- a/Math.java +++ b/Math.java @@ -5,14 +5,14 @@ public class Math { static final int B = 4; static final int C = 5; - static void mult(){ - System.out.println("The result of mult is: " + (A*B*C)); + static void multiplication(){ + System.out.println("The result of multiplication is: " + (A*B*C)); } - static void add(){ - System.out.println("The result of add is: " + (A+B+C)); + static void addition(){ + System.out.println("The result of addition is: " + (A+B+C)); } - static void sub(){ - System.out.println("The result of sub is: " + (A-B-C)); + static void subtraction(){ + System.out.println("The result of subtraction is: " + (A-B-C)); } } From 75b522b50fcae962f5ebca5bf03d6ddcc37134fe Mon Sep 17 00:00:00 2001 From: yurysid <52960653+yurysid@users.noreply.github.com> Date: Fri, 26 Jul 2019 13:59:48 +0300 Subject: [PATCH 4/4] Update Main.java --- Main.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Main.java b/Main.java index bb25e0a..4bc388d 100644 --- a/Main.java +++ b/Main.java @@ -3,13 +3,10 @@ public class Main { public static void main(String[] args) { - Math mult = new Math(); - Math add = new Math(); - Math sub = new Math(); - mult.multiplication(); - add.addition(); - sub.subtraction(); + Math.multiplication(); + Math.addition(); + Math.subtraction(); System.out.println("");