javajigi · Oct 17, 2018 · Oct 8, 2018 · Oct 16, 2018 · Oct 16, 2018 · Oct 16, 2018
diff --git a/src/main/java/coordinate/CoordinateMain.java b/src/main/java/coordinate/CoordinateMain.java
@@ -1,6 +1,7 @@
 package coordinate;
 
 import coordinate.domain.Coordinate;
+import coordinate.domain.FigureFactory;
 import coordinate.domain.Point;
 import coordinate.dto.PointDtoFactory;
 import coordinate.inputview.InputView;
@@ -19,7 +20,7 @@ public static void main(String[] args) {
             coordinate.drawPoint(pointDtoFactory.getPointDTO());
 
             ResultView resultView = new ResultView(coordinate.getCoordinatesAxis(), coordinate.getCoordinatePlane());
-            resultView.toDo(points);
+            resultView.toDisplay(FigureFactory.create(points).result());
 
         } catch (IllegalArgumentException e) {
             System.out.println(e.getMessage());

diff --git a/src/main/java/coordinate/domain/AbstractFigure.java b/src/main/java/coordinate/domain/AbstractFigure.java
@@ -0,0 +1,38 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+public abstract class AbstractFigure implements Figure{
+    protected ArrayList<Point> points;
+
+    public AbstractFigure(ArrayList<Point> points) {
+        this.points = points;
+    }
+
+    private Boolean isSamePoint() {
+        HashSet<Point> isTrue = new HashSet<>(points);
+        return isTrue.size() == this.points.size();
+    }
+
+    public String result() {
+        if (this.points.size() < size()) {
+            return name() + "이 아닙니다.";
+        }
+        if (!isSamePoint()) {
+            throw new IllegalArgumentException("같은 점을 입력했습니다. " + name() + "이 아닙니다. 다시 입력해 주세요");
+        }
+        if (!isFigure()) {
+            throw new IllegalArgumentException(name() + "이 아닙니다. 다시 입력 해주세요");
+        }
+        return name()+ "의 면적은 " + area() + " 입니다.";
+    }
+
+    protected boolean isFigure() {
+        return true;
+    }
+
+    protected abstract String name();
+
+    protected abstract int size();
+}
diff --git a/src/main/java/coordinate/domain/Coordinate.java b/src/main/java/coordinate/domain/Coordinate.java
@@ -37,8 +37,6 @@ public void drawPoint(ArrayList<PointDTO> points) {
         }
     }
 
-
-
     public ArrayList<CoordinateString> getCoordinatesAxis() {
         return coordinatesAxis;
     }

diff --git a/src/main/java/coordinate/domain/Figure.java b/src/main/java/coordinate/domain/Figure.java
@@ -0,0 +1,5 @@
+package coordinate.domain;
+
+public interface Figure {
+    double area();
+}
diff --git a/src/main/java/coordinate/domain/FigureCreator.java b/src/main/java/coordinate/domain/FigureCreator.java
@@ -0,0 +1,7 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+
+public interface FigureCreator {
+    AbstractFigure create(ArrayList<Point> points);
+}
diff --git a/src/main/java/coordinate/domain/FigureFactory.java b/src/main/java/coordinate/domain/FigureFactory.java
@@ -0,0 +1,19 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class FigureFactory {
+    private static HashMap<Integer, FigureCreator> whatFigure = new HashMap<>();
+    static {
+        whatFigure.put(2,new LineFactory());
+        whatFigure.put(3,new TriangleFactory());
+        whatFigure.put(4,new RectangleFactory());
+    }
+    public static AbstractFigure create(ArrayList<Point> points) {
+        if (!whatFigure.containsKey(points.size())) {
+            throw new IllegalArgumentException("도형이 아닙니다.");
+        }
+        return whatFigure.get(points.size()).create(points);
+    }
+}
diff --git a/src/main/java/coordinate/domain/Line.java b/src/main/java/coordinate/domain/Line.java
@@ -2,17 +2,25 @@
 
 import java.util.ArrayList;
 
-public class Line {
-    private ArrayList<Point> points;
+public class Line extends AbstractFigure {
 
     public Line(ArrayList<Point> points) {
-        this.points = points;
+        super(points);
     }
-    public String calculate() {
-        if (points.size() == 2) {
-            return  "직선의 길이는 " + points.get(0).calculateLIne(points.get(1)) + " 입니다.";
-        }
-        return "직선이 아닙니다.";
+
+    @Override
+    protected String name() {
+        return "직선";
+    }
+
+    @Override
+    protected int size() {
+        return 2;
+    }
+
+    @Override
+    public double area() {
+        return points.get(0).calculateLIne(points.get(1));
     }
 
 }
diff --git a/src/main/java/coordinate/domain/LineFactory.java b/src/main/java/coordinate/domain/LineFactory.java
@@ -0,0 +1,10 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+
+public class LineFactory implements FigureCreator {
+    @Override
+    public AbstractFigure create(ArrayList<Point> points) {
+        return new Line(points);
+    }
+}
diff --git a/src/main/java/coordinate/domain/Rectangle.java b/src/main/java/coordinate/domain/Rectangle.java
@@ -3,30 +3,18 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 
-public class Rectangle {
-    private ArrayList<Point> points;
+public class Rectangle extends AbstractFigure {
     private HashSet<Integer> base = new HashSet<>();
     private HashSet<Integer> height = new HashSet<>();
 
     public Rectangle(ArrayList<Point> points) {
-        this.points = points;
+        super(points);
         for (Point point : this.points) {
             this.base.add(point.getXPoint());
             this.height.add(point.getYPoint());
         }
     }
 
-    public String calculate() {
-        if (this.points.size() < 4) {
-            return "사각형이 아닙니다.";
-        }
-        if (isRectangle().equals(false)) {
-            throw new IllegalArgumentException("사각형이 아닙니다.");
-        }
-        int[] a = findBaseHeight();
-        return "사각형의 면적은 " + (a[0] * a[1]) + " 입니다.";
-    }
-
     private int[] findBaseHeight() {
         int[] BaseAndHeight = new int[2];
         for (int i = 1; i < points.size(); i++) {
@@ -40,7 +28,24 @@ private int[] findBaseHeight() {
         return BaseAndHeight;
     }
 
-    private Boolean isRectangle() {
-        return (this.base.size() == 2 && this.height.size() == 2);
+    @Override
+    protected boolean isFigure() {
+        return this.base.size() == 2 && this.height.size() == 2;
+    }
+
+    @Override
+    protected String name() {
+        return "사각형";
+    }
+
+    @Override
+    protected int size() {
+        return 4;
+    }
+
+    @Override
+    public double area() {
+        int[] a = findBaseHeight();
+        return a[0] * a[1];
     }
 }
diff --git a/src/main/java/coordinate/domain/RectangleFactory.java b/src/main/java/coordinate/domain/RectangleFactory.java
@@ -0,0 +1,10 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+
+public class RectangleFactory implements FigureCreator {
+    @Override
+    public AbstractFigure create(ArrayList<Point> points) {
+        return new Rectangle(points);
+    }
+}
diff --git a/src/main/java/coordinate/domain/Triangle.java b/src/main/java/coordinate/domain/Triangle.java
@@ -2,28 +2,10 @@
 
 import java.util.ArrayList;
 
-public class Triangle {
-    private ArrayList<Point> points;
+public class Triangle extends AbstractFigure {
 
     public Triangle(ArrayList<Point> points) {
-        this.points = points;
-    }
-
-    public String calculate() {
-        if (this.points.size() < 3) {
-            return "사각형이 아닙니다.";
-        }
-        if (isTriangle().equals(false)) {
-            throw new IllegalArgumentException("사각형이 아닙니다.");
-        }
-        double[] a = findLine();
-        double s = (a[0] + a[1] + a[2]) / 2;
-        double result = Math.sqrt(s * (s - a[0]) * (s - a[1]) * (s - a[2]));
-        return "삼각형의 면적은 " + result + " 입니다.";
-    }
-
-    private Boolean isTriangle() {
-        return true;
+        super(points);
     }
 
     private double[] findLine() {
@@ -33,4 +15,21 @@ private double[] findLine() {
         }
         return lines;
     }
+
+    @Override
+    protected String name() {
+        return "삼각형";
+    }
+
+    @Override
+    protected int size() {
+        return 3;
+    }
+
+    @Override
+    public double area() {
+        double[] a = findLine();
+        double s = (a[0] + a[1] + a[2]) / 2;
+        return Math.sqrt(s * (s - a[0]) * (s - a[1]) * (s - a[2]));
+    }
 }
diff --git a/src/main/java/coordinate/domain/TriangleFactory.java b/src/main/java/coordinate/domain/TriangleFactory.java
@@ -0,0 +1,10 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+
+public class TriangleFactory implements FigureCreator{
+    @Override
+    public AbstractFigure create(ArrayList<Point> points) {
+        return new Triangle(points);
+    }
+}
diff --git a/src/main/java/coordinate/resultview/ResultView.java b/src/main/java/coordinate/resultview/ResultView.java
@@ -1,16 +1,11 @@
 package coordinate.resultview;
 
-import coordinate.domain.*;
+import coordinate.domain.CoordinateYLine;
 import coordinate.utils.CoordinateString;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 public class ResultView {
-    private static final int FOUR = 4;
-    private static final int T = 3;
-    private static final int TWO = 2;
-
     private static final int MAXiMUM_NUM = 24;
     private static final String DASH = "---";
     private static final String PLUS = "   +";
@@ -22,6 +17,7 @@ public class ResultView {
     public ResultView(ArrayList<CoordinateString> coordinateAxis, ArrayList<CoordinateYLine> coordinatePlane) {
         this.coordinateAxis = coordinateAxis;
         this.coordinatePlane = coordinatePlane;
+
     }
 
     private void displayYCoordinate() {
@@ -44,16 +40,13 @@ private void displayXCoordinate() {
         System.out.println();
     }
 
-    public void toDo(ArrayList<Point> points) {
-        HashMap<Integer, String> toDo = new HashMap<>();
-        toDo.put(TWO, new Line(points).calculate());
-        toDo.put(FOUR, new Rectangle(points).calculate());
-        toDo.put(T, new Triangle(points).calculate());
-        displayTest();
-        System.out.println(toDo.get(points.size()));
+
+    public void toDisplay(String result) {
+        displayCoordinate();
+        System.out.println(result);
     }
 
-    public void displayTest() {
+    public void displayCoordinate() {
         displayYCoordinate();
         displayXCoordinate();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,8 +37,6 @@ public void drawPoint(ArrayList<PointDTO> points) { @@
             }
         }
         public ArrayList<CoordinateString> getCoordinatesAxis() {
             return coordinatesAxis;
         }
@@ Expand Down @@