diff --git a/src/tse/lr2/Circle.java b/src/tse/lr2/Circle.java index 9924ec2..50dcae8 100644 --- a/src/tse/lr2/Circle.java +++ b/src/tse/lr2/Circle.java @@ -12,8 +12,9 @@ public class Circle extends Ellipse { super(); } - public Circle(Point p1, Point p2, Point p3, Point p4) { - super(p1, p2, p3, p4); + public Circle(Point p1, Point p2) { + super(new Point(p1.x, p1.y), new Point(p2.x, p1.y), + new Point(p1.x, p2.y), new Point(p2.x, p2.y)); } public boolean isConsist(Point point) { diff --git a/src/tse/lr2/LR_2_Tasks.java b/src/tse/lr2/LR_2_Tasks.java index aa7a991..75492dc 100644 --- a/src/tse/lr2/LR_2_Tasks.java +++ b/src/tse/lr2/LR_2_Tasks.java @@ -50,14 +50,8 @@ public class LR_2_Tasks { ); ellipse3 = new Ellipse(ellipse1); - circle1 = new Circle( - new Point(1, 1), new Point(6, 1), - new Point(1, 6), new Point(6, 6) - ); - circle2 = new Circle( - new Point(5, 4), new Point(15, 4), - new Point(5, 14), new Point(15, 14) - ); + circle1 = new Circle( new Point(1, 1), new Point(6, 6) ); + circle2 = new Circle( new Point(5, 4), new Point(15, 14) ); point1 = new Point(3, 3); }