From 48ac144239c0312ac562977fd1010b71445477e1 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Fri, 4 Oct 2013 17:58:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20Circle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tse/lr2/Circle.java     |  5 +++--
 src/tse/lr2/LR_2_Tasks.java | 10 ++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

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);
     }