From 79257353d9d63b3111fd50208023f04082679582 Mon Sep 17 00:00:00 2001
From: joeappleton18 <joeappleton18@gmail.com>
Date: Wed, 31 Jan 2024 08:19:32 +0000
Subject: [PATCH] completed the solution for tasl 1.1
---
src/main/java/l_1/Bedroom.java | 11 ++---------
src/main/java/l_1/DiningRoom.java | 13 +++----------
src/main/java/l_1/Lounge.java | 12 +++---------
src/main/java/l_1/Room.java | 12 ++++++++++--
4 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/src/main/java/l_1/Bedroom.java b/src/main/java/l_1/Bedroom.java
index 770af2a..15bebb9 100644
--- a/src/main/java/l_1/Bedroom.java
+++ b/src/main/java/l_1/Bedroom.java
@@ -13,17 +13,10 @@ package l_1;
*
*/
-public class Bedroom implements Room {
-
- private double area = 0.0;
+public class Bedroom extends Room {
public Bedroom(double area) {
- this.area = area;
- }
-
- @Override
- public double getArea() {
- return this.area;
+ super(area);
}
}
\ No newline at end of file
diff --git a/src/main/java/l_1/DiningRoom.java b/src/main/java/l_1/DiningRoom.java
index b942c33..cb655cb 100644
--- a/src/main/java/l_1/DiningRoom.java
+++ b/src/main/java/l_1/DiningRoom.java
@@ -1,16 +1,9 @@
package l_1;
-public class DiningRoom implements Room {
- private double area = 0.0;
+public class DiningRoom extends Room {
public DiningRoom(double area) {
- this.area = area;
- }
-
-
- @Override
- public double getArea() {
- return this.area;
- }
+ super(area);
+ }
}
diff --git a/src/main/java/l_1/Lounge.java b/src/main/java/l_1/Lounge.java
index 782e70d..6a138c0 100644
--- a/src/main/java/l_1/Lounge.java
+++ b/src/main/java/l_1/Lounge.java
@@ -13,17 +13,11 @@ package l_1;
*
*/
-public class Lounge implements Room {
-
- private double area = 0.0;
+public class Lounge extends Room {
public Lounge(double area) {
- this.area = area;
- }
-
- @Override
- public double getArea() {
- return this.area;
+ super(area);
}
+
}
\ No newline at end of file
diff --git a/src/main/java/l_1/Room.java b/src/main/java/l_1/Room.java
index ff9e183..2b097c9 100644
--- a/src/main/java/l_1/Room.java
+++ b/src/main/java/l_1/Room.java
@@ -8,12 +8,20 @@ package l_1;
*
*/
-public interface Room {
+public abstract class Room {
+ private double area = 0.0;
+
+ public Room(double area) {
+ this.area = area;
+ }
+
/**
* Gets the area of a room.
* @param void.
* @return double.
*/
- public double getArea();
+ public double getArea() {
+ return this.area;
+ }
}
--
GitLab