From 565f69ecf30a83ca13c7c1fa2c1e47f6c12a7b16 Mon Sep 17 00:00:00 2001 From: soufiane-cheouati <46105138+soufiane-cheouati@users.noreply.github.com> Date: Sun, 3 Feb 2019 20:44:04 +0000 Subject: [PATCH] Add files via upload --- .../java/com/baeldung/markerinterface/DeletableShape.java | 6 ++---- .../main/java/com/baeldung/markerinterface/Rectangle.java | 2 +- .../src/main/java/com/baeldung/markerinterface/Shape.java | 6 ++++++ .../main/java/com/baeldung/markerinterface/ShapeDao.java | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java index d5ae52c9f2..7674407da8 100644 --- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java +++ b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/DeletableShape.java @@ -1,7 +1,5 @@ package com.baeldung.markerinterface; -public interface DeletableShape { - double getArea(); +public interface DeletableShape extends Shape { - double getCircumference(); -} \ No newline at end of file +} diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java index f8ea987c6f..d64ffad0a2 100644 --- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java +++ b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Rectangle.java @@ -1,6 +1,6 @@ package com.baeldung.markerinterface; -public class Rectangle implements Deletable { +public class Rectangle implements DeletableShape { private double width; private double height; diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java new file mode 100644 index 0000000000..2e53aefc03 --- /dev/null +++ b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/Shape.java @@ -0,0 +1,6 @@ +package com.baeldung.markerinterface; + +public interface Shape { + double getArea(); + double getCircumference(); +} \ No newline at end of file diff --git a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java index 49a389bd46..bc988a793d 100644 --- a/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java +++ b/core-java-lang-oop/src/main/java/com/baeldung/markerinterface/ShapeDao.java @@ -3,7 +3,7 @@ package com.baeldung.markerinterface; public class ShapeDao { public boolean delete(Object object) { - if (!(object instanceof Deletable)) { + if (!(object instanceof DeletableShape)) { return false; } // Calling the code that deletes the entity from the database