diff --git a/MoreOnClasses/src/main/java/com/oop/Car.java b/MoreOnClasses/src/main/java/com/oop/Car.java new file mode 100644 index 0000000..fec72df --- /dev/null +++ b/MoreOnClasses/src/main/java/com/oop/Car.java @@ -0,0 +1,7 @@ +package com.oop; + +public class Car extends Vehicle { + Car(){ + inheritedName = "HERITAGE!"; + } +} diff --git a/MoreOnClasses/src/main/java/com/oop/Main.java b/MoreOnClasses/src/main/java/com/oop/Main.java index 11d7473..390240b 100644 --- a/MoreOnClasses/src/main/java/com/oop/Main.java +++ b/MoreOnClasses/src/main/java/com/oop/Main.java @@ -8,5 +8,18 @@ public class Main { Pupil pupil = new Pupil(); pupil.setAge(a); + + Standard standard1 = new Standard(); + Pro pro1 = new Pro(); + + //standard version + standard1.draw(); + standard1.write(); + + //Pro version + pro1.draw(); + pro1.write(); + pro1.useEffects(); + pro1.changeResolution(); } } \ No newline at end of file diff --git a/MoreOnClasses/src/main/java/com/oop/Pro.java b/MoreOnClasses/src/main/java/com/oop/Pro.java new file mode 100644 index 0000000..0920c8d --- /dev/null +++ b/MoreOnClasses/src/main/java/com/oop/Pro.java @@ -0,0 +1,11 @@ +package com.oop; + +public class Pro extends Standard { + protected void useEffects() { + System.out.println("Using Effects"); + } + + protected void changeResolution() { + System.out.println("Changing Resolution"); + } +} diff --git a/MoreOnClasses/src/main/java/com/oop/Standard.java b/MoreOnClasses/src/main/java/com/oop/Standard.java new file mode 100644 index 0000000..1f1c31d --- /dev/null +++ b/MoreOnClasses/src/main/java/com/oop/Standard.java @@ -0,0 +1,11 @@ +package com.oop; + +public class Standard { + protected void draw() { + System.out.println("Drawing"); + } + + protected void write() { + System.out.println("Writing"); + } +} diff --git a/MoreOnClasses/src/main/java/com/oop/Vehicle.java b/MoreOnClasses/src/main/java/com/oop/Vehicle.java new file mode 100644 index 0000000..5aa01d2 --- /dev/null +++ b/MoreOnClasses/src/main/java/com/oop/Vehicle.java @@ -0,0 +1,31 @@ +package com.oop; + +public class Vehicle { + protected String inheritedName; + static int counter; + public int maxSpeed; + public int wheels; + public String color; + public double fuelCapacity; + public Vehicle() { + this.setColor("Red"); + } + Vehicle(String c) { + this.setColor(c); + } + + public void horn() { + System.out.println("Beep!"); + } + + //Getter + public String getColor() { + return color; + } + + // Setter + public void setColor(String c) { + this.color = c; + } + +} diff --git a/MoreOnClasses/target/classes/com/oop/Car.class b/MoreOnClasses/target/classes/com/oop/Car.class new file mode 100644 index 0000000..259d1e7 Binary files /dev/null and b/MoreOnClasses/target/classes/com/oop/Car.class differ diff --git a/MoreOnClasses/target/classes/com/oop/Main.class b/MoreOnClasses/target/classes/com/oop/Main.class index 793f48e..41d020a 100644 Binary files a/MoreOnClasses/target/classes/com/oop/Main.class and b/MoreOnClasses/target/classes/com/oop/Main.class differ diff --git a/MoreOnClasses/target/classes/com/oop/Pro.class b/MoreOnClasses/target/classes/com/oop/Pro.class new file mode 100644 index 0000000..a0b5e87 Binary files /dev/null and b/MoreOnClasses/target/classes/com/oop/Pro.class differ diff --git a/MoreOnClasses/target/classes/com/oop/Standard.class b/MoreOnClasses/target/classes/com/oop/Standard.class new file mode 100644 index 0000000..8464903 Binary files /dev/null and b/MoreOnClasses/target/classes/com/oop/Standard.class differ diff --git a/MoreOnClasses/target/classes/com/oop/Vehicle.class b/MoreOnClasses/target/classes/com/oop/Vehicle.class new file mode 100644 index 0000000..bb05307 Binary files /dev/null and b/MoreOnClasses/target/classes/com/oop/Vehicle.class differ