From cf665801d957eb7a7a67291d2972af5f649d57da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 12 Feb 2021 12:11:21 +0100 Subject: move constuctor and delegate add(int, Person) --- src/se/liu/gusso230/lab3/ListManipulator.java | 4 ++++ src/se/liu/gusso230/shapes/AbstractShape.java | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/se/liu/gusso230/lab3/ListManipulator.java b/src/se/liu/gusso230/lab3/ListManipulator.java index 7aae8e6..d23e39e 100644 --- a/src/se/liu/gusso230/lab3/ListManipulator.java +++ b/src/se/liu/gusso230/lab3/ListManipulator.java @@ -29,6 +29,10 @@ public class ListManipulator { return elements.add(person); } + public void add(final int i, final Person person) { + elements.add(i, person); + } + public boolean remove(final Object o) { return elements.remove(o); } diff --git a/src/se/liu/gusso230/shapes/AbstractShape.java b/src/se/liu/gusso230/shapes/AbstractShape.java index 5c6d965..0423654 100644 --- a/src/se/liu/gusso230/shapes/AbstractShape.java +++ b/src/se/liu/gusso230/shapes/AbstractShape.java @@ -8,6 +8,12 @@ public abstract class AbstractShape implements Shape { protected int y; protected Color color; + protected AbstractShape(int x, int y, Color color) { + this.x = x; + this.y = y; + this.color = color; + } + @Override public boolean equals(final Object o) { if (this == o) { return true; @@ -23,12 +29,6 @@ public abstract class AbstractShape implements Shape { return Objects.hash(x, y, color); } - protected AbstractShape(int x, int y, Color color) { - this.x = x; - this.y = y; - this.color = color; - } - @Override public int getX() { return x; } -- cgit v1.2.1