Изменён конструктор класса Circle
This commit is contained in:
parent
6e2ab63405
commit
48ac144239
@ -12,8 +12,9 @@ public class Circle extends Ellipse {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Circle(Point p1, Point p2, Point p3, Point p4) {
|
public Circle(Point p1, Point p2) {
|
||||||
super(p1, p2, p3, p4);
|
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) {
|
public boolean isConsist(Point point) {
|
||||||
|
@ -50,14 +50,8 @@ public class LR_2_Tasks {
|
|||||||
);
|
);
|
||||||
ellipse3 = new Ellipse(ellipse1);
|
ellipse3 = new Ellipse(ellipse1);
|
||||||
|
|
||||||
circle1 = new Circle(
|
circle1 = new Circle( new Point(1, 1), new Point(6, 6) );
|
||||||
new Point(1, 1), new Point(6, 1),
|
circle2 = new Circle( new Point(5, 4), new Point(15, 14) );
|
||||||
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)
|
|
||||||
);
|
|
||||||
|
|
||||||
point1 = new Point(3, 3);
|
point1 = new Point(3, 3);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user